From bc960bbb2bdd0721383f58ab936fb8785be8ff77 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Mon, 20 May 2024 09:19:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA=E3=80=82?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/callback/PayCallbackService.java | 3 ++ .../web/controller/order/OrderController.java | 3 +- .../order/OrderDetailController.java | 7 +--- .../order/OrderMasterController.java | 14 +++++++ .../web/controller/pay/AlipayController.java | 7 +++- .../controller/worker/WorkerController.java | 7 +++- .../ghy/web/pojo/vo/WorkerListRequest.java | 3 +- .../src/main/resources/application-druid.yml | 2 +- .../main/resources/static/css/cascader.css | 37 ++++++++++++------- .../templates/order/batchChangePrice.html | 36 ++++++++++++++++++ .../resources/templates/order/master.html | 28 +++++++------- .../templates/order/orderManager.html | 36 ++++++++++++------ .../resources/templates/order/pc-master.html | 26 ++++++------- .../order/request/OrderChangePriceReq.java | 19 ++++++++++ .../ghy/order/service/OrderMasterService.java | 7 ++++ .../service/impl/OrderMasterServiceImpl.java | 29 +++++++++++++++ .../mapper/order/OrderDetailMapper.xml | 12 +++--- .../ghy/payment/domain/PaymentRelation.java | 2 + .../quartz/service/impl/OrderServiceImpl.java | 16 ++++---- 19 files changed, 218 insertions(+), 76 deletions(-) create mode 100644 ghy-admin/src/main/resources/templates/order/batchChangePrice.html create mode 100644 ghy-order/src/main/java/com/ghy/order/request/OrderChangePriceReq.java diff --git a/ghy-admin/src/main/java/com/ghy/callback/PayCallbackService.java b/ghy-admin/src/main/java/com/ghy/callback/PayCallbackService.java index e52ce48b..7645e1c8 100644 --- a/ghy-admin/src/main/java/com/ghy/callback/PayCallbackService.java +++ b/ghy-admin/src/main/java/com/ghy/callback/PayCallbackService.java @@ -140,6 +140,9 @@ public class PayCallbackService implements CallBackService { financialMasterService.updateFinancialMaster(financialMaster2Update); log.info("订单追加[{}]支付成功", relationId); + } else if (PaymentRelation.CONSULT_ADD.equals(relation.getRelationIdType())) { + // 更新加价单的支付信息 + financialChangeRecordService.updatePay(relationId, paymentId, PayStatus.PAID.getCode()); } else { log.error("未知的订单类型: relationIdType={}, relationId={}", relation.getRelationIdType(), relationId); } diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 2bd4f76a..a61a4189 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -265,6 +265,7 @@ public class OrderController extends BaseController { orderMaster.setConsultMode(request.getConsultMode()); if("01".equalsIgnoreCase(orderMaster.getConsultMode())){ orderMaster.setOrderMode("02"); + orderMaster.setPayMode("01"); } // 存在登陆用户的情况下 if(getSysUser() != null){ @@ -1393,7 +1394,7 @@ public class OrderController extends BaseController { if(goods.getDeptGoodsCategoryId() != null){ Long categoryId = null; // 前端发单和后台派单 - if(com.ghy.common.utils.StringUtils.isEmpty(orderMaster.getOrderMode())){ + if(com.ghy.common.utils.StringUtils.isEmpty(orderMaster.getOrderMode())||"01".equals(orderMaster.getConsultMode())){ DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(goods.getDeptGoodsCategoryId()); if(deptGoodsCategory != null){ categoryId = deptGoodsCategory.getGoodsCategoryId(); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index eae14317..1c4b8a34 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -561,9 +561,6 @@ public class OrderDetailController extends BaseController { // 商品规格及信息 List orderStandardList = orderGoodsService.selectByOrderDetailId(detail.getId()); - // 商品信息 - GoodsStandard goodsStandard = goodsStandardService.selectById(orderStandardList.get(0).getGoodsStandardId()); - Goods goods = goodsService.selectById(orderMaster.getGoodsId()); // 填充商品三级类目 if(goods.getDeptGoodsCategoryId() != null){ @@ -994,8 +991,8 @@ public class OrderDetailController extends BaseController { if (orderDetail.getOrderStatus().equals(OrderStatus.FINISH_CHECK.code())) { return AjaxResult.success("发起成功"); } - if (orderDetail.getOrderStatus() != OrderStatus.SERVER.code() - || !orderMaster.getPayStatus().equals(PayStatus.PAID.getCode())) { + if (!"01".equals(orderMaster.getConsultMode()) && (orderDetail.getOrderStatus() != OrderStatus.SERVER.code() + || !orderMaster.getPayStatus().equals(PayStatus.PAID.getCode()))) { return AjaxResult.error("未支付订单或非服务中订单，发起完单失败"); } diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index 3a2c4da2..703c97b7 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -24,6 +24,7 @@ import com.ghy.customer.service.CustomerService; import com.ghy.goods.domain.*; import com.ghy.goods.service.*; import com.ghy.order.domain.*; +import com.ghy.order.request.OrderChangePriceReq; import com.ghy.order.request.SysOrderAssignRequest; import com.ghy.order.request.SysOrderGoodsStandards; import com.ghy.order.service.*; @@ -121,6 +122,19 @@ public class OrderMasterController extends BaseController { @Resource private CustomerAddressService customerAddressService; + @GetMapping("/changePrice/{orderIds}") + public String changePrice(@PathVariable("orderIds") String orderIds, ModelMap mmap) + { + mmap.put("orderIds", orderIds); + return "order/batchChangePrice"; + } + + @PostMapping(value = "batchChangePrice") + @ResponseBody + public AjaxResult batchChangePrice(@Validated OrderChangePriceReq changePriceReq){ + return orderMasterService.batchChangePrice(changePriceReq); + } + // @RequiresPermissions("order:master:view") @GetMapping() diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java b/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java index e91fb2df..28a2f40c 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/pay/AlipayController.java @@ -178,15 +178,18 @@ public class AlipayController extends BaseController { ArrayList relations = new ArrayList<>(); // 主单是否付款 没付款的话一起付 boolean fmPaid = Objects.equals(PayStatus.WAIT_PAY.getCode(), fm.getPayStatus()); - if (fmPaid) { + if (fmPaid && !"01".equals(orderMaster.getConsultMode())) { payMoney = payMoney.add(fm.getPayMoney()); relations.add(new PaymentRelation(null, fm.getId(), PaymentRelation.FINANCIAL_MASTER, fm.getPayMoney())); } // 查询关联的加价单 FinancialChangeRecord fcr = financialChangeRecordService.selectNotPayRecordByDetailId(orderDetailId); - if (fcr != null) { + if (fcr != null && !"01".equals(orderMaster.getConsultMode())) { payMoney = payMoney.add(fcr.getChangeMoney()); relations.add(new PaymentRelation(null, fcr.getId(), PaymentRelation.FINANCIAL_CHANGE, fcr.getChangeMoney())); + }else if(fcr != null){ + payMoney = payMoney.add(fcr.getChangeMoney()); + relations.add(new PaymentRelation(null, fcr.getId(), PaymentRelation.CONSULT_ADD, fcr.getChangeMoney())); } OrderAttachmentRecord param = new OrderAttachmentRecord(); param.setOrderDetailId(orderDetailId); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java index 8a4a5d54..c9544b51 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerController.java @@ -262,7 +262,12 @@ public class WorkerController extends BaseController { setDistrictIds(worker.getDistrictIds()); }})); } else { - workerListResponse.setWorkerAreas(workerAreaService.getByWorker(w.getWorkerId())); + List workerAreas = workerAreaService.getByWorker(w.getWorkerId()); + if(workerAreas.size() > 10){ + workerListResponse.setWorkerAreas(workerAreas.subList(0,10)); + }else { + workerListResponse.setWorkerAreas(workerAreas); + } } workerListResponse.setGoodsCategories(workerGoodsCategoryService.getByWorker(w.getWorkerId())); workerListResponse.setSpecialSkills(specialSkillService.getByWorker(w.getWorkerId())); diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java index 9255034e..bc8d2785 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/WorkerListRequest.java @@ -1,5 +1,6 @@ package com.ghy.web.pojo.vo; +import com.ghy.common.core.domain.BaseEntity; import com.ghy.worker.domain.Worker; import lombok.Data; @@ -10,7 +11,7 @@ import java.util.List; * @date : 2022-06-24 17:38 */ @Data -public class WorkerListRequest { +public class WorkerListRequest extends BaseEntity { private Long areaId; private List areaIds; diff --git a/ghy-admin/src/main/resources/application-druid.yml b/ghy-admin/src/main/resources/application-druid.yml index ca1ad4d2..d3ef7ab0 100644 --- a/ghy-admin/src/main/resources/application-druid.yml +++ b/ghy-admin/src/main/resources/application-druid.yml @@ -45,7 +45,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://121.62.23.77:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://121.62.23.77:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: gqz password: Clunt@12345 # 从库数据源 diff --git a/ghy-admin/src/main/resources/static/css/cascader.css b/ghy-admin/src/main/resources/static/css/cascader.css index 8decd094..719e634e 100644 --- a/ghy-admin/src/main/resources/static/css/cascader.css +++ b/ghy-admin/src/main/resources/static/css/cascader.css @@ -19,22 +19,33 @@ body { z-index: 100; } .cascader-wrap:after { - opacity: 1; - content: ""; - border-color: transparent transparent #888 transparent; - border-style: solid; - height: 0; - margin-top: -2px; + /*opacity: 1;*/ + content: "展开"; + padding: 5px 10px; + background-color: #1d85c6; + color: #feffff; + border-radius: 4px; + text-align: center; position: absolute; - top: 50%; - right: 10px; - width: 0; - border-width: 0 4px 5px 4px; - transform: rotate(180deg); + top: 12%; + right: 5px; + /*border-color: transparent transparent #888 transparent;*/ + /*border-style: solid;*/ + /*height: 0;*/ + /*margin-top: -2px;*/ + /*position: absolute;*/ + /*top: 50%;*/ + /*right: 10px;*/ + /*width: 0;*/ + /*border-width: 0 4px 5px 4px;*/ + /*transform: rotate(180deg);*/ transition: all 0.1s; } .cascader-wrap.is-show:after { - transform: rotate(0deg); + /*transform: rotate(0deg);*/ + content: "收起"; + background-color: #e82d2d; + color: #feffff; } .cascader-wrap.is-show .eo-cascader-panel { display: block; @@ -62,7 +73,7 @@ body { z-index: 9; } .cascader-wrap.is-clear:after { - opacity: 0; + /*opacity: 0;*/ } .eo-cascader-panel { display: flex; diff --git a/ghy-admin/src/main/resources/templates/order/batchChangePrice.html b/ghy-admin/src/main/resources/templates/order/batchChangePrice.html new file mode 100644 index 00000000..fa0e2e24 --- /dev/null +++ b/ghy-admin/src/main/resources/templates/order/batchChangePrice.html @@ -0,0 +1,36 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+
+ + + + + diff --git a/ghy-admin/src/main/resources/templates/order/master.html b/ghy-admin/src/main/resources/templates/order/master.html index 23a62ad9..3503f118 100644 --- a/ghy-admin/src/main/resources/templates/order/master.html +++ b/ghy-admin/src/main/resources/templates/order/master.html @@ -630,14 +630,14 @@ return '
' + '' + '
' - + ' ' + row.code + '
' - + ' ' + row.consoleGoodsName+ '
' - + ' 联系人：' + row.addressName + '
' - + ' 联系电话：' + row.addressPhone + '
' - + ' 联系地址：' + row.address + '
' - + ' 下单时间：' + row.createTime + '
' - + ' 预约时间：' + row.mixExpectTime + '
' - + ' 总金额：' + row.financialMasterMoney + '元 应得金额：' + row.financialDetailMoney + '元
' + + '

' + row.code + '

' + + '

' + row.consoleGoodsName + '

' + + '

联系人：' + row.addressName + '

' + + '

联系电话：' + row.addressPhone + '

' + + '

联系地址：' + row.address + '

' + + '

下单时间：' + row.createTime + '

' + + '

预约时间：' + row.mixExpectTime + '

' + + '

总金额：' + row.financialMasterMoney + '元 应得金额：' + row.financialDetailMoney + '元

' + '
' + '
'; } @@ -656,21 +656,21 @@ }, { field: 'goodsWorker', - title: '接单师傅', + title: '师傅接单信息', formatter: function (value, row, index) { if(value){ - return '' + value.name + '
' - + '' + value.phone + ''; + return '

' + value.name + '

' + + '

' + value.phone + '

'; } } }, { field: 'worker', - title: '做单信息', + title: '师傅做单信息', formatter: function (value, row, index) { if(value){ - return '' + value.name + value.phone + '
' - + '接单时间：' + value.createTime + ''; + return '

' + value.name + value.phone + '

' + + '

接单时间：' + value.createTime + '

'; } } }, diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index bb7ed328..f4a8d2bc 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -322,6 +322,9 @@ 指派 + + 批量改价 + @@ -640,14 +643,14 @@ return '
' + '' + '
' - + '' + row.code + '
' - + ' ' + row.consoleGoodsName + '
' - + ' 联系人：' + row.addressName + '
' - + ' 联系电话：' + row.addressPhone + '
' - + ' 联系地址：' + row.address + '
' - + ' 下单时间：' + row.createTime + '
' - + ' 预约时间：' + row.mixExpectTime + '
' - + ' 下单总金额：' + row.financialMasterMoney + '元,师傅实收金额: '+ row.financialMasterPayMoney + '
' + + '

' + row.code + ' +

' + + '

' + row.consoleGoodsName + '

' + + '

联系人：' + row.addressName + '

' + + '

联系电话：' + row.addressPhone + '

' + + '

联系地址：' + row.address + '

' + + '

下单时间：' + row.createTime + '

' + + '

预约时间：' + row.mixExpectTime + '

' + + '

下单总金额：' + row.financialMasterMoney + '元,师傅实收金额: '+ row.financialMasterPayMoney + '

' + '
' + '
'; } @@ -680,11 +683,11 @@ }, { field: 'worker', - title: '接单信息', + title: '师傅接单信息', formatter: function (value, row, index) { if(value){ - return '' + value.name + value.phone + '
' - + '接单时间：' + row.createTime + ''; + return '

' + value.name + value.phone + '

' + + '

接单时间：' + row.createTime + '

'; } } }, @@ -978,6 +981,17 @@ }); } + function batchChangePrice() { + table.set(); + var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); + if (rows.length === 0) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } + var url = prefix + "/changePrice/" + rows.join(","); + $.modal.open("批量改价", url, '800', '300'); + } + function mergePay() { table.set(); var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); diff --git a/ghy-admin/src/main/resources/templates/order/pc-master.html b/ghy-admin/src/main/resources/templates/order/pc-master.html index 16d060f2..fc65018b 100644 --- a/ghy-admin/src/main/resources/templates/order/pc-master.html +++ b/ghy-admin/src/main/resources/templates/order/pc-master.html @@ -421,16 +421,16 @@ return '
' + '' + '
' - + '' + row.code + '
' - + ' ' + row.consoleGoodsName + '
' - + ' 联系人：' + row.addressName + '
' - + ' 联系电话：' + row.addressPhone + '
' - + ' 联系地址：' + row.address + '
' - + ' 下单时间：' + row.createTime + '
' - + ' 预约时间：' + row.mixExpectTime + '
' - + ' 下单总金额：' + row.financialMasterMoney + '元,师傅实收金额: '+ row.financialMasterPayMoney + '
' - + '
' - + '
'; + + '

' + row.code + '

' + + '

' + row.consoleGoodsName + '

' + + '

联系人：' + row.addressName + '

' + + '

联系电话：' + row.addressPhone + '

' + + '

联系地址：' + row.address + '

' + + '

下单时间：' + row.createTime + '

' + + '

预约时间：' + row.mixExpectTime + '

' + + '

下单总金额：' + row.financialMasterMoney + '元,师傅实收金额: '+ row.financialMasterPayMoney + '

' + + '

' + + '

'; } }, { @@ -443,11 +443,11 @@ }, { field: 'worker', - title: '接单信息', + title: '师傅接单信息', formatter: function (value, row, index) { if(value){ - return '' + value.name + '
' - + '接单时间：' + row.createTime + ''; + return '

' + value.name + '

' + + '

接单时间：' + row.createTime + '

'; } } }, diff --git a/ghy-order/src/main/java/com/ghy/order/request/OrderChangePriceReq.java b/ghy-order/src/main/java/com/ghy/order/request/OrderChangePriceReq.java new file mode 100644 index 00000000..5d89dda5 --- /dev/null +++ b/ghy-order/src/main/java/com/ghy/order/request/OrderChangePriceReq.java @@ -0,0 +1,19 @@ +package com.ghy.order.request; + +import lombok.Data; + +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; + +@Data +public class OrderChangePriceReq { + + @NotBlank + private String orderIds; + + @Min(value = 1L) + @Max(value = 9999L) + private String changePrice; + +} diff --git a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java index 98d9f5fe..db22102c 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java +++ b/ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java @@ -4,6 +4,7 @@ import com.ghy.common.core.domain.AjaxResult; import com.ghy.order.domain.OrderMaster; import com.ghy.order.domain.OrderMasterCount; import com.ghy.order.request.AppOrderRequest; +import com.ghy.order.request.OrderChangePriceReq; import com.huifu.adapay.core.exception.BaseAdaPayException; import java.util.Collection; @@ -168,4 +169,10 @@ public interface OrderMasterService { int reject(OrderMaster orderMaster); OrderMasterCount differentStatusOrderCount(OrderMaster orderMaster); + + /** + * @param changePriceReq 批量改价 + */ + AjaxResult batchChangePrice(OrderChangePriceReq changePriceReq); + } diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index ea3a83af..29250df3 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -1,11 +1,13 @@ package com.ghy.order.service.impl; +import cn.hutool.core.util.NumberUtil; import com.alibaba.fastjson.JSONObject; import com.ghy.common.adapay.model.AdapayStatusEnum; import com.ghy.common.adapay.model.AdpCode; import com.ghy.common.adapay.model.DivMember; import com.ghy.common.adapay.model.PaymentDTO; import com.ghy.common.constant.UserConstants; +import com.ghy.common.core.domain.AjaxResult; import com.ghy.common.core.text.Convert; import com.ghy.common.enums.AdapayOrderType; import com.ghy.common.enums.OrderStatus; @@ -18,6 +20,7 @@ import com.ghy.order.domain.OrderMaster; import com.ghy.order.domain.OrderMasterCount; import com.ghy.order.mapper.OrderMasterMapper; import com.ghy.order.request.AppOrderRequest; +import com.ghy.order.request.OrderChangePriceReq; import com.ghy.order.service.OrderDetailService; import com.ghy.order.service.OrderGoodsService; import com.ghy.order.service.OrderMasterService; @@ -575,4 +578,30 @@ public class OrderMasterServiceImpl implements OrderMasterService { public OrderMasterCount differentStatusOrderCount(OrderMaster orderMaster) { return orderMasterMapper.differentStatusOrderCount(orderMaster); } + + @Override + public AjaxResult batchChangePrice(OrderChangePriceReq changePriceReq) { + BigDecimal changePrice = new BigDecimal(changePriceReq.getChangePrice()); + String [] idStr = changePriceReq.getOrderIds().split(","); + List idsList = new ArrayList<>(); + for (String id : idStr){ + idsList.add(Long.parseLong(id)); + } + List orderMasters = orderMasterMapper.selectByIds(idsList); + long statusCount = orderMasters.stream().filter(x->x.getOrderStatus() != 1 && x.getOrderStatus() != 2).count(); + if(statusCount > 0){ + return AjaxResult.error("请不要选择不符合状态的订单!"); + } + for (OrderMaster model : orderMasters) { + FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(model.getId()); + if (NumberUtil.isGreater(changePrice, financialMaster.getServerMoney())) { + // 补充付款 todo 插入改价表数据 + }else { + // 减少大师傅所得 todo 插入改价表数据 + } + financialMaster.setServerMoney(changePrice); + financialMasterService.updateFinancialMaster(financialMaster); + } + return AjaxResult.success(); + } } diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml index 7790cdc0..262786f9 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml @@ -192,9 +192,9 @@ #{drawCashStatus} - - AND od.work_finish_time is not null - + + + AND od.timeout_ = #{timeout} @@ -260,9 +260,9 @@ AND od.shelve_status = ${shelveStatus} - - AND od.work_finish_time is not null - + + + AND od.draw_cash_status in diff --git a/ghy-payment/src/main/java/com/ghy/payment/domain/PaymentRelation.java b/ghy-payment/src/main/java/com/ghy/payment/domain/PaymentRelation.java index 6a038e99..a1076eca 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/domain/PaymentRelation.java +++ b/ghy-payment/src/main/java/com/ghy/payment/domain/PaymentRelation.java @@ -49,4 +49,6 @@ public class PaymentRelation { public static final String FINANCIAL_CHANGE = "financial_change"; public static final String ORDER_ATTACHMENT = "order_attachment"; public static final String ORDER_ADD = "order_add"; + /** 合约订单加价 */ + public static final String CONSULT_ADD = "consult_add"; } diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java index 172b1bde..751b3ec3 100644 --- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java +++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java @@ -76,11 +76,11 @@ public class OrderServiceImpl implements OrderService { } // 查询符合超时的子单 -// List orders = orderDetailService.selectByStatus(timeoutOrderStatus); -// log.info("扫描到{}条未完成的子订单", orders.size()); -// for (OrderDetail order : orders) { -// executor.execute(() -> checkTimeout(order)); -// } + List orders = orderDetailService.selectByStatus(timeoutOrderStatus); + log.info("扫描到{}条未完成的子订单", orders.size()); + for (OrderDetail order : orders) { + executor.execute(() -> checkTimeout(order)); + } } @Transactional(rollbackFor = Exception.class) @@ -181,7 +181,7 @@ public class OrderServiceImpl implements OrderService { OrderTimeoutRecord record = new OrderTimeoutRecord(order.getId(), order.getWorkerId(), order.getDeptId(), order.getOrderStatus()); record.setPayMoney(getFineMoney(order)); record.setFineStatus(0); - orderFineRecordMapper.insert(record); +// orderFineRecordMapper.insert(record); orderDetailService.updateTimeout(order.getId(), 1, 1); } } else if (timeoutOrderStatus.contains(order.getOrderStatus())) { @@ -210,7 +210,7 @@ public class OrderServiceImpl implements OrderService { OrderTimeoutRecord record = new OrderTimeoutRecord(order.getId(), order.getWorkerId(), order.getDeptId(), order.getOrderStatus()); record.setPayMoney(getFineMoney(order)); record.setFineStatus(0); - orderFineRecordMapper.insert(record); +// orderFineRecordMapper.insert(record); orderDetailService.updateTimeout(order.getId(), 1, 1); } } else if (times == 1) { @@ -223,7 +223,7 @@ public class OrderServiceImpl implements OrderService { OrderTimeoutRecord record = new OrderTimeoutRecord(order.getId(), order.getWorkerId(), order.getDeptId(), order.getOrderStatus()); record.setPayMoney(getFineMoney(order)); record.setFineStatus(0); - orderFineRecordMapper.insert(record); +// orderFineRecordMapper.insert(record); orderDetailService.updateTimeout(order.getId(), 1, 2); } }