From c328e4f4c4f8b6718dad94111f96af7451496a40 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 18 Oct 2023 23:23:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=86=85?= =?UTF-8?q?=E5=AE=B93=E5=92=8C5=E4=B8=A4=E7=82=B9=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=B8=AD3=E4=B8=BB=E8=A6=81=E7=BC=BA=E5=B0=91=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E4=BF=AE=E6=94=B9=E3=80=82=E7=9C=81=E5=B8=82=E5=8C=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=85=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderCallRecordController.java | 7 +- .../order/OrderMasterController.java | 34 +++++-- .../templates/order/orderManager.html | 87 ++++++++++++++++++ .../resources/templates/order/record.html | 88 +++++++++++++++++++ .../com/ghy/order/domain/OrderCallRecord.java | 4 +- .../com/ghy/order/domain/OrderMaster.java | 7 ++ .../mapper/order/OrderMasterMapper.xml | 8 ++ 7 files changed, 224 insertions(+), 11 deletions(-) create mode 100644 ghy-admin/src/main/resources/templates/order/record.html diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java index 985bfab5..b352fe9c 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderCallRecordController.java @@ -30,11 +30,12 @@ public class OrderCallRecordController extends BaseController @Autowired private IOrderCallRecordService orderCallRecordService; - @RequiresPermissions("worker:record:view") +// @RequiresPermissions("worker:record:view") @GetMapping() - public String record() + public String record(Long orderId, ModelMap mmap) { - return prefix + "/record"; + mmap.put("orderId", orderId); + return prefix; } /** 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 9a39e4da..d8b7fa02 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 @@ -13,10 +13,7 @@ import com.ghy.common.core.page.PageDomain; import com.ghy.common.core.page.TableDataInfo; import com.ghy.common.core.page.TableSupport; import com.ghy.common.enums.*; -import com.ghy.common.utils.ExceptionUtil; -import com.ghy.common.utils.MoneyUtil; -import com.ghy.common.utils.StringUtils; -import com.ghy.common.utils.WechatMsgUtils; +import com.ghy.common.utils.*; import com.ghy.common.utils.poi.ExcelUtil; import com.ghy.customer.domain.Customer; import com.ghy.customer.domain.CustomerAddress; @@ -57,6 +54,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -97,6 +95,9 @@ public class OrderMasterController extends BaseController { @Autowired private CustomerService customerService; + @Autowired + private IOrderCallRecordService orderCallRecordService; + @Resource private FinancialMasterService financialMasterService; @Resource @@ -111,8 +112,7 @@ public class OrderMasterController extends BaseController { private IAfterServiceRecordService afterServiceRecordService; @Resource private FinancialChangeRecordService financialChangeRecordService; - @Autowired - private IOrderCallRecordService orderCallRecordService; + // @RequiresPermissions("order:master:view") @GetMapping() @@ -120,6 +120,20 @@ public class OrderMasterController extends BaseController { return prefix; } + @PostMapping("/changeIsCharge") + @ResponseBody + public AjaxResult changeIsCharge(OrderMaster orderMaster) + { + return toAjax(orderMasterService.updateOrderMaster(orderMaster)); + } + + @PostMapping("/changeIsContact") + @ResponseBody + public AjaxResult changeIsContact(OrderMaster orderMaster) + { + return toAjax(orderMasterService.updateOrderMaster(orderMaster)); + } + /** * 修改详细订单 */ @@ -726,6 +740,14 @@ public class OrderMasterController extends BaseController { master.setFinancialMasterMoney(fm.getPayMoney()); master.setFinancialMasterPayMoney(fm.getServerMoney()); } + OrderCallRecord orderCallRecordParam = new OrderCallRecord(); + orderCallRecordParam.setOrderType("01"); + orderCallRecordParam.setOrderId(master.getId()); + List orderCallRecords = orderCallRecordService.selectOrderCallRecordList(orderCallRecordParam); + if(CollectionUtils.isNotEmpty(orderCallRecords)){ + OrderCallRecord newOne = orderCallRecords.stream().sorted(Comparator.comparing(OrderCallRecord::getCallTime).reversed()).collect(Collectors.toList()).get(0); + master.setLastCallTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",newOne.getCallTime())); + } Goods good = goodsMap.get(master.getGoodsId()); if (good != null) { master.setGoods(good); diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index da52a814..e6a1d38a 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/ghy-admin/src/main/resources/templates/order/orderManager.html @@ -337,6 +337,8 @@ + + + \ No newline at end of file diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java index d080c14c..186da86a 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderCallRecord.java @@ -29,8 +29,8 @@ public class OrderCallRecord extends BaseEntity private String orderType; /** 联系时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "联系时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd") + @Excel(name = "联系时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:dd") private Date callTime; } diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index 61d477c9..6847e793 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java @@ -155,6 +155,10 @@ public class OrderMaster extends BaseEntity { private String payMode; + private String isCharge; + + private String isContact; + private Integer sysPayStatus; /** @@ -171,4 +175,7 @@ public class OrderMaster extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; + + private String lastCallTime; + } diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 218bf8f5..6406f471 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -13,6 +13,8 @@ + + @@ -44,6 +46,8 @@ order_type, order_mode, pay_mode, + is_charge, + is_contact, order_status, pay_type, pay_status, @@ -73,6 +77,8 @@ om.order_type, om.order_mode, om.pay_mode, + om.is_charge, + om.is_contact, om.order_status, om.pay_type, om.pay_status, @@ -328,6 +334,8 @@ all_self_assigned = null, has_dispatched_all = #{hasDispatchedAll}, is_call = #{isCall}, + is_charge = #{isCharge}, + is_contact = #{isContact}, timeout_ = #{timeout}, update_time = SYSDATE()