From e5a7c1bb99bd1cc9cf9ae69ba71168db9e17f733 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Thu, 4 May 2023 23:20:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=8F=B7=E6=8E=88=E6=9D=83=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ghy/system/config/WxMsgConfig.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ghy-system/src/main/java/com/ghy/system/config/WxMsgConfig.java b/ghy-system/src/main/java/com/ghy/system/config/WxMsgConfig.java index 43c4a919..364a2e15 100644 --- a/ghy-system/src/main/java/com/ghy/system/config/WxMsgConfig.java +++ b/ghy-system/src/main/java/com/ghy/system/config/WxMsgConfig.java @@ -1,5 +1,6 @@ package com.ghy.system.config; +import com.ghy.common.json.JSON; import lombok.Data; /** @@ -23,7 +24,10 @@ public class WxMsgConfig { /** * 点击消息后跳转的页面 */ - private String page = "index"; + private String page = "pages/index/index"; + + // 跳转的目标小程序 +// private Object miniprogram; /** * 跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版 From c25587ffb661c741a4d852147199fe0d7a1463eb Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Fri, 5 May 2023 00:42:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E7=95=8C=E7=BA=BF=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E6=96=87=E6=A1=88=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ghy/web/controller/order/OrderController.java | 2 ++ .../controller/order/OrderMasterController.java | 5 ++++- .../com/ghy/web/pojo/vo/OrderStandardDetail.java | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) 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 9474f74b..c0197705 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 @@ -1128,6 +1128,8 @@ public class OrderController extends BaseController { orderListResponse.setIsOverTime(isOverTime); orderListResponse.setAfterServiceRecordList(detailRecordMap.get(detail.getId())); orderListResponse.setChangeMoney(changeMoney); + orderListResponse.setDrawCashStatus(detail.getDrawCashStatus()); + orderListResponse.setDrawCashTime(detail.getDrawCashTime()); orderListResponses.add(orderListResponse); }); return orderListResponses; 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 f780d9c3..1c4ff15b 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 @@ -457,7 +457,7 @@ public class OrderMasterController extends BaseController { GoodsImgs qryImgsObj = new GoodsImgs(); qryImgsObj.setRemark(orderDetail.getId().toString()); qryImgsObj.setImgType(ImgType.FINISH_IMG.getId()); - qryImgsObj.setGoodsId(0l); + qryImgsObj.setGoodsId(0L); List goodsImgs = goodsImgsService.qryGoodsImgs(qryImgsObj); finishImgList = goodsImgs.stream().map(GoodsImgs::getImgUrl).collect(Collectors.toList()); } @@ -505,6 +505,9 @@ public class OrderMasterController extends BaseController { orderStandardDetail.setIsOnlyServ(this.checkIsOnlyServer(orderMaster.getId(), orderDetail.getWorkerId()) ? Boolean.TRUE : Boolean.FALSE); + orderStandardDetail.setDrawCashStatus(orderDetail.getDrawCashStatus()); + orderStandardDetail.setDrawCashTime(orderDetail.getDrawCashTime()); + orderStandardDetails.add(orderStandardDetail); } diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java index ee06d80c..7904bf1e 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java +++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStandardDetail.java @@ -55,4 +55,19 @@ public class OrderStandardDetail { private Boolean isOverTime; private BigDecimal serverMoney; + + /** + * draw_cash_status + * 0 未分账 + * 1 已分账 + * 2 已到账 + * -1 提现失败 + */ + private Integer drawCashStatus; + + /** + * 发起提现时间 draw_cash_time + */ + private Date drawCashTime; + }