Merge remote-tracking branch 'origin/master'

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;

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> 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);
             }
 

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;
+
 }

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为正式版；默认为正式版