lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单

localizer
lzq 2025-09-19 19:54:48 +08:00
parent 13b0f99443
commit fe23a8e53b
18 changed files with 281 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/constant/BizObj.java
View File

@ -26,9 +26,40 @@ public enum BizObj implements DictStr {
ChanFeiDanWei("ChanFeiDanWei", "产废单位"),
QingYunGongSi("QingYunGongSi", "清运公司"),
XiaoNaCang("XiaoNaCang", "消纳场"),
ZhengFuBuMen("ZhengFuBuMen", "政府部门");
;
private final String val;
private final String txt;
/**
* 判断是否为清运公司
*/
public boolean isTrans() {
return this == QiYe || this == GeTi;
}
/**
* 判断是否为个人
*/
public boolean isWastePersonal() {
return this == GeRen;
}
/**
* 判断是否为产废单位
*/
public boolean isWasteCompany() {
return this == ShiGongDanWei
|| this == WuYe
|| this == ChaiQian
|| this == SheQu;
}
/**
* 判断是否为产废单位或个人
*/
public boolean isWaste() {
return isWastePersonal() || isWasteCompany();
}
}

8
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/controller/BizProjectController.java
View File

@ -69,6 +69,14 @@ public class BizProjectController {
return R.success(bizProjectService.paging(pageParam, bizProjectEntity));
}
/**
* 查询合作的清运公司
*/
@GetMapping("/paging_trans")
public R<PageResult<SearchBizProjectResult>> pagingTrans(PageParam pageParam, BizProjectEntity bizProjectEntity) {
return R.success(bizProjectService.pagingTrans(pageParam, bizProjectEntity));
}
/**
* 审核
*

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/entity/BizTruckEntity.java
View File

@ -35,6 +35,11 @@ public class BizTruckEntity {
*/
private String licensePlate;
/**
* 车辆类型
*/
private String truckCategory;
/**
* 行驶证图片
*/

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/pojo/result/SearchTruckResult.java
View File

@ -30,7 +30,10 @@ public class SearchTruckResult {
* 车牌
*/
private String licensePlate;
/**
* 车辆类型
*/
private String truckCategory;
/**
* 行驶证图片
*/

7
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizCompanyService.java
View File

@ -133,13 +133,12 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
switch (bizObj) {
case ShiGongDanWei:
case QingYunGongSi:
case XiaoNaCang:
bizCompanyEntity = this.getOne(Wrappers.<BizCompanyEntity>lambdaQuery().eq(BizCompanyEntity::getUserId, userId));
id = bizCompanyEntity.getId();
break;
case ZhengFuBuMen:
bizCompanyEntity = this.getById(id);
break;
// case ZhengFuBuMen:
// bizCompanyEntity = this.getById(id);
// break;
default:
throw Exceptions.exception("不允许查询");
}

16
njzscloud-svr/src/main/java/com/njzscloud/supervisory/biz/service/BizProjectService.java
View File

@ -6,9 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njzscloud.common.core.ex.Exceptions;
import com.njzscloud.common.core.ienum.Dict;
import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.biz.constant.AuditStatus;
import com.njzscloud.supervisory.biz.constant.BizObj;
import com.njzscloud.supervisory.biz.mapper.BizProjectMapper;
import com.njzscloud.supervisory.biz.pojo.entity.BizProjectEntity;
import com.njzscloud.supervisory.biz.pojo.result.SearchBizProjectResult;
@ -82,4 +86,16 @@ public class BizProjectService extends ServiceImpl<BizProjectMapper, BizProjectE
throw Exceptions.exception("数据状态已改变，无法审核");
}
}
public PageResult<SearchBizProjectResult> pagingTrans(PageParam pageParam, BizProjectEntity bizProjectEntity) {
UserDetail userDetail = SecurityUtil.loginUser();
BizObj bizObj = Dict.parse(userDetail.getBizObj(), BizObj.values());
Assert.isTrue(bizObj != null && bizObj.isWaste(), () -> Exceptions.exception("非产废单位或个人，不能查询合作的清运公司"));
Long userId = userDetail.getUserId();
return PageResult.of(baseMapper.paging(pageParam.toPage(), Wrappers.<BizProjectEntity>query()
.eq("b.user_id", userId)
.like(StrUtil.isNotBlank(bizProjectEntity.getProjectName()), "a.project_name", bizProjectEntity.getProjectName())
));
}
}

1
njzscloud-svr/src/main/java/com/njzscloud/supervisory/geo/controller/GeoFenceConfigController.java
View File

@ -15,6 +15,7 @@ import java.util.List;
* 地图栅栏配置
*/
@Slf4j
@CrossOrigin
@RestController
@RequestMapping("/geo_fence_config")
@RequiredArgsConstructor

5
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/controller/OrderInfoController.java
View File

@ -7,7 +7,6 @@ import com.njzscloud.common.mp.support.PageResult;
import com.njzscloud.common.security.support.UserDetail;
import com.njzscloud.common.security.util.SecurityUtil;
import com.njzscloud.supervisory.order.contant.OrderCategory;
import com.njzscloud.supervisory.order.pojo.entity.OrderInfoEntity;
import com.njzscloud.supervisory.order.pojo.param.*;
import com.njzscloud.supervisory.order.pojo.result.ObtainWeighBillResult;
import com.njzscloud.supervisory.order.pojo.result.OrderCertificateResult;
@ -47,8 +46,8 @@ public class OrderInfoController {
* 修改
*/
@PostMapping("/modify")
public R<?> modify(@RequestBody OrderInfoEntity orderInfoEntity) {
orderInfoService.modify(orderInfoEntity);
public R<?> modify(@RequestBody ModifyOrderParam modifyOrderParam) {
orderInfoService.modify(modifyOrderParam);
return R.success();
}

9
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/entity/OrderInfoEntity.java
View File

@ -28,6 +28,15 @@ public class OrderInfoEntity {
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 联系人
*/
private String contacts;
/**
* 联系方式
*/
private String phone;
/**
* 订单编号

9
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/AddOrderInfoParam.java
View File

@ -37,6 +37,15 @@ public class AddOrderInfoParam implements Constrained {
* 清运公司 Id
*/
private Long transCompanyId;
/**
* 联系人
*/
private String contacts;
/**
* 联系方式
*/
private String phone;
/**
* 站点 Id

55
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/ModifyOrderCargoPlaceParam.java 100644
View File

@ -0,0 +1,55 @@
package com.njzscloud.supervisory.order.pojo.param;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
/**
* 装货地址
*/
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class ModifyOrderCargoPlaceParam {
/**
* 区县; 代码
*/
private String area;
/**
* 乡镇街道; 代码
*/
private String town;
/**
* 区县; 名称
*/
private String areaName;
/**
* 乡镇街道; 名称
*/
private String townName;
/**
* 详细地址
*/
private String address;
/**
* 经度
*/
@NotNull(message = "未指定经度")
private Double lng;
/**
* 纬度
*/
@NotNull(message = "未指定纬度")
private Double lat;
}

64
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/param/ModifyOrderParam.java 100644
View File

@ -0,0 +1,64 @@
package com.njzscloud.supervisory.order.pojo.param;
import com.njzscloud.supervisory.order.contant.OrderCategory;
import com.njzscloud.supervisory.order.contant.PayerCategory;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.util.List;
@Getter
@Setter
@ToString
@Accessors(chain = true)
public class ModifyOrderParam {
private ModifyOrderCargoPlaceParam cargoPlace;
/**
* 产品 Id; order_goods.id
*/
private Long goodsId;
/**
* 清运公司 Id
*/
private Long transCompanyId;
/**
* 站点 Id
*/
private Long stationId;
/**
* 目标站点 Id
*/
private Long targetStationId;
/**
* 短驳入订单 Id
*/
private Long targetOrderId;
/**
* 订单类型; 字典代码：order_category
*/
private OrderCategory orderCategory;
/**
* 付款方资金账户 Id
*/
private Long payer;
/**
* 支付方类型; 字典代码：payer_category
*/
private PayerCategory payerCategory;
/**
* 现场照片
*/
private List<String> sitePhotos;
/**
* 客户备注
*/
private String customerMemo;
}

11
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/pojo/result/OrderPagingResult.java
View File

@ -27,7 +27,7 @@ public class OrderPagingResult {
/**
* 手机号
*/
private String phone;
private String userPhone;
private String companyName;
// endregion
// region 订单信息
@ -74,6 +74,15 @@ public class OrderPagingResult {
* 下单人 Id; sys_user.id
*/
private Long userId;
/**
* 联系人
*/
private String contacts;
/**
* 联系方式
*/
private String phone;
/**
* 审核状态; 字典代码：audit_status

3
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -116,8 +116,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
/**
* 修改
*/
public void modify(OrderInfoEntity orderInfoEntity) {
this.updateById(orderInfoEntity);
public void modify(ModifyOrderParam modifyOrderParam) {
}
/**

2
njzscloud-svr/src/main/resources/application-dev.yml
View File

@ -16,6 +16,8 @@ spring:
- /test/**
- /device_info/report1
- /device_info/report2
- /geo_fence_config/**
- /statistics/**
app:
default-place:

8
njzscloud-svr/src/main/resources/mapper/biz/BizProjectMapper.xml
View File

@ -43,11 +43,9 @@
INNER JOIN biz_company c ON c.user_id = a.user_id AND b.deleted = 0
INNER JOIN sys_user d ON a.user_id = d.id AND b.deleted = 0
INNER JOIN sys_user e ON a.other_user_id = e.id AND b.deleted = 0
<where>
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</where>
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
ORDER BY a.modify_time DESC
</select>
</mapper>

6
njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml
View File

@ -102,11 +102,13 @@
g.contacts trans_contacts,
g.phone trans_phone,
h.nickname,
h.phone,
h.phone user_phone,
j.company_name,
k.nickname checker_name,
l.project_name,
m.company_name station_name
m.company_name station_name,
a.contacts,
a.phone
FROM order_info a
LEFT JOIN order_cargo_place b ON b.id = a.cargo_place_id
LEFT JOIN order_goods c ON c.id = a.goods_id

53
z-doc/db-model/njzscloud.pdma.json
View File

@ -4,7 +4,7 @@
"avatar": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABAEAYAAAD6+a2dAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAACv9JREFUeNrtnHtUVNUex7+/M+ADNBgkynfKDIiEmsrN11UhUYsB35ilBWoODBY+1l2+uHot8uYbCwZGE9EUn3nVQUEx8xFmoiGhYszgVdPsijJoXeR1zr5/4LC8oJnMwMHmfP5hLdj795ove++zZ+8DSEhISEhISNgiJHYAjYVWe9cvvfR5y5ZCaFkKlzdwIPIpn9vfurWgYCuRmp19965Go1CcPSt2nNbG5gTwXLJOZ5ju7s7FVI7ALpUKodSOOgQGUgnccHbQICQgml1q0qRmP7YIDGznzuIZrq7l8ydOBELGe+8qLxc7H0v5EwpgEfua2dk5xzy/pe3Ffv3QjUviClUqtMRcvK1S0WgY2VEvrzqbVwBYM3euKUujUcYtXSp2tpbyzArguT6fz7ww1sVF5lDWyX7osGEslVvN3Q4KotFMhtxhw/AdZrEPXVys7ngFDuKwwWCaotmrjPDwELsOlmIndgBPwiUj/sf8T7y82EnqiCEqFb6iv3KTVSq8WL4Ypf36IYM2Mz87O2rL/sbMncY9hYM38Aq9eecOCiGwXWlpCIOKzqWmMo7dYP8dPZrCKRmvhoRUtz+BYbRIJgOwV+zaWINGIIAdOxiTyeTOhTsuF/Tty66QP3tXpUI2FLgSHMxG4ys25uEhm4WxLwHkYvNTuRkBUP/LlzEMC6BLTSVvxAg79PqibrKcu4nHjgHq8N6dKipwqKq5c7iWM1wPCAAA3Be7RvVHgwmgxRld4o+Jrq5NAnie8/fzYyOxDGeCgrDndoYxIzgYIH90cnKiTgCSAQDGp3LQG8exhufZfhiAU6eoP6YAej0tYa+xdvv2FQVEeipv5eUhGcAoAEBkdd+tDVWFxofVBSA3xl0wDvX2ZqfJDuNHjgTP9cDyoCBS896szNeXAbkgjsMezIFvHRy8ilW0sKgIP7H9+DotDdHUBwl6vfBmWZHss4MH79JM6kTFxQCqHtkCxC1wY8cKAljEGOM45zy3GwUbtVoMpWHMbdo0MiESSiKArcRAAEDu01hlazGDIi9dQlMMwHy9Hj8Ik4XnU1OLo92WKFIyM4EQTyKexwRU/UdPeHYXtGJisQDki18oM5ydPRv9sI/6q9V4eGj9PcajmIIqKtALP7AhJ05QDPPBmNTUytbIpr16/b1xkeWKQ0YjgCMP5uUjYhfrz4jFAmAyakbJU6cSmBZRj2jwe0N23v8N2dsQB+Cq2CWxLSwWADVj+zGrY0cAV8E/9Ac/rMCaJUtMu10/cU9ZuFAashsnnMUWivAeKanWh8nimQ4TbtwAQkKIeL4upiXqH8sFIPFMIwnAxpEEYOM0gq3gKuQliXqjvG9frBN+QpaPj9UMv0WzoRIEbjgXy8/45ps7Z9Vqz/BLl8TOt7EgugDkzvFjC4wDBuBlYa6Qf/w4TIgEI+s9IfyDrYQe4FP4Am5NSYnrCZ0ur7lCcXuJWu11/+ZNsfMXG/GngN34C0vx8kL1zmH9QG/hJUQ5OPBXhdeaDOrcWey0GwuiC6BiFn+E3dqzB2PxLdpkZ1vdQWf44IAgsHRaiMz0dNMW7rDpo9On62wvFz5swUsvyb9NaGucERv7QsDyTTmzHR3FrKEliD4F/Hbug3RlXGEhzgGI69kTwBdWdWA+xfdq9W/CLbJ3Gbl4g+PwBlvAEBVV3r/F+45Tg4NdftDG50+YNq2omybSY+vhww1aRAsQfQR45slk/2Sfd+rERkJLkw4dkodpOxpSNm0yn1gSO7wnIQnAWpjXMHswB76TJnH7KnY1icvJkcu13fNnBwaKHd7jkATwtHjiDK28coUABhYSghmYjOaFhTWbkSebh1/btQOgpvDUVOdYbbwhf8cO88EYsdMwIwmgjhSZNJFKj507hVVIasJ7erIdAMauXfu49rQYBBo3zv4Uf4dTXrjgPD7+lDHhnXfEzkMSgIXcvavRdOxoMhUHaDTKHLUa/blkbnlgIAAdMq5dq9Xh75Cjg5sbHaLv2ZCNG+Ve2q7GgXq9S0mCPt+lbduGjl/0pwAzrXU63c/vOTjcb81vL/VVKNgkjBX87e0ttcudFQZBU1pqUtifKP44Px9Qh/f2raiorzxMqeGn3dceOODy+qfDDdN9fIRVsmByWLaMAqtOStXa7/gF09l6lYoNYj/RmtxcZ2/tTePymTOLL2haK5pv3FjfdRd9BHBy0mrzJ3TuXHqezyjZevUqvYuxvF9ODscBjJ05Y+lP+HLHWPz58865/BdOynPnGuq5vSjtg3Rl3L17xV6R7RSh4eGsA3xwwM/PfK+gVgcjgCi5nH7Gv9j15GTn7xJcDclpaXJnXWKBsUOH+opTdAFwIWSPdwICsBn+LLv+Fkc0EG+jsGvX8iyHfS0iXnmlofMsPqrZpow7dszxfOl/mpV0786O0jf0xbJlCMBEmllZWSve4exD9B8+nBn5JOZ9/rxcntDFMD0iAmCMWXGrXHQBYGdlkEx58iQWoCNkZWX15ucjmHDt1i2+S9P2pXMvXhQr3eurZ51qP/v+/eLuESmKD+fMEQ5iM2L79EFXxNKsnJya7UmJUHa+ZUuAfYAorVY+PaG9MfvIkZbz4nzzPmvVytJ4RF8DmIrff9FdkZsrj9ElFhg9PISvhPYI7dVLNoRdEzbYWRyfsIo1waelpXw+21PpefLkr6emZnnvKioSO28z1beOM3WJZ7J8fZ1j+PbPlc+ZQ80Aah4djY9xFXzTptUdtmA+Wg4ebLdZdsweK1YAyALCwurqX3QBmDEVq8PdFdeuoRcAPFg9W+PmXZ1L09BULU6LowEgJqbqStyXXzItTaTrmzZBg48R1bt3dfN/sEHsxxEjAGy3xKv4U4DEIykKiPT0mJuXJ7yJ74AtW2o1eLBotNSPJAAbRxKAjSMJwMaRBGDjiP4UYN6ZKwt0/NVBvWEDXccSuPTsidtYQF0t3/BgCtKwkMpKmsxCKfPAAVObiA3u38+aBRARMWap/Zo4sfix+dt79KBD1I1GJiTQVrhSeze3WnEFYgZ6lJfTRdwTliQlmRZpmnn0Xr68oepuRnQBlMY6nnHQhYRwA9AF4ePGAVgA04MiZVpun8C0AICVAIvy8Gg1Wnv43z1SUu7sBoCsLGvnQ6EkcOujo2kfXFnPPn0elwftRSwAQI5eZFi6tOoAyfr1905NXd2Q+xSiTwHcABxj6lu36t3Rg7OBFT9DJ/iZTPXmJx6x6FD7fMDjYKfhSKN++80xjO8il5eW1nsdaiD6CGAyaXI8Vu7f7/J6wm1D2ZQpwk4WSqW+vvgWqSyLs1igNJvWIaOykk0XNDCkp98Li9yliDM+3dtHngLmWNZetm7ePDg1S6hM++UXrGMRmNemTa24zqI3+LIyysACbNu27aZarW4zqqSkvutdE9EFYKYoLWKhMi4pCS2wEEhKsqpxNwBheK8h8njoujuAxYsRAM0TO41qiMgejehTgIS4SAKwcSQB2DiSAGwcSQA2jiQAG0cSgI0jCcDGkQRg4zzx27bqb+vGOfZ0XLN7Nx1GBwz390cGNrPVlh/alLAS5jev2kHLUjIzqaDyZSSNGGG+n/C4bk/8AMtcHDwcFWPG0BwcZ3lDh4qdp8Rj2A5npre3BzAfGDxYGCrrSd4jRwJIBzZtely3J04BdBArKODyZbHzk/iDyBEPA2O0QVaI+Y+4gVSDP3zgwumjhIACN39/bh8bJYT41uVF7xL1iQdri72MCZu5YFw7ffouRZCSjh4VOywJCQkJCQkJCYlGyP8A/eZcApAQzfUAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjEtMDctMjRUMTg6NTY6NTcrMDg6MDCiMaMiAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIxLTA3LTI0VDE4OjU2OjU3KzA4OjAw02wbngAAAEx0RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fdjh0ZTByYWQxdmQvZ29uZ3NpLTAxLnN2Z1gR1IgAAAAASUVORK5CYII=",
"version": "4.9.4",
"createdTime": "2023-4-13 11:53:52",
"updatedTime": "2025-9-18 16:51:03",
"updatedTime": "2025-9-19 11:31:22",
"dbConns": [],
"profile": {
"default": {
@ -10127,6 +10127,40 @@
"extProps": {},
"id": "BD266581-1ED6-468F-8B97-9859551A8167"
},
{
"defKey": "contacts",
"defName": "联系人",
"comment": "",
"type": "VARCHAR",
"len": 255,
"scale": "",
"primaryKey": false,
"notNull": true,
"autoIncrement": false,
"defaultValue": "''",
"hideInGraph": false,
"refDict": "",
"baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231",
"extProps": {},
"id": "7CFE8E76-F64B-4974-B477-7341C0314998"
},
{
"defKey": "phone",
"defName": "联系方式",
"comment": "",
"type": "VARCHAR",
"len": 20,
"scale": "",
"primaryKey": false,
"notNull": true,
"autoIncrement": false,
"defaultValue": "''",
"hideInGraph": false,
"refDict": "",
"baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231",
"extProps": {},
"id": "8087BDDD-FC34-4964-96DF-B038BB6C93B8"
},
{
"defKey": "audit_status",
"defName": "审核状态",
@ -15062,6 +15096,23 @@
"extProps": {},
"id": "59027463-F763-4738-94D1-E79B2717EC5E"
},
{
"defKey": "truck_category",
"defName": "车辆类型",
"comment": "",
"type": "VARCHAR",
"len": 64,
"scale": "",
"primaryKey": false,
"notNull": true,
"autoIncrement": false,
"defaultValue": "''",
"hideInGraph": false,
"refDict": "",
"baseType": "AA07828C-4FCB-4EDA-9B51-53A3F264F231",
"extProps": {},
"id": "EA78B1C0-3A99-4024-8AC4-DD1FEABEFBB7"
},
{
"defKey": "license_plate",
"defName": "车牌",