修复后台合并支付时,前端的分帐bug

2，派单搜索姓名，未能搜索（注意派主单处搜索和分派处搜索）
3，搜索地址搜索不了。
4，品牌和规格搜索不了。
5，下单模式未展示，且上面筛选处未能筛选下单模式。
6，原来第5点下单的备注提到后台。未见

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java

@@ -267,6 +267,16 @@ public class OrderDetailController extends BaseController {
             if (fc != null) {
                 detail.setChangeMoney(fc.getChangeMoney());
             }
+            // 完单图片
+            GoodsImgs param = new GoodsImgs();
+            param.setRemark(String.valueOf(detail.getId()));
+            param.setImgType(ImgType.FINISH_IMG.getId());
+            List<GoodsImgs> imgsList = goodsImgsService.qryGoodsImgs(param);
+            StringBuilder stringBuilder = new StringBuilder();
+            imgsList.forEach(model->{
+                stringBuilder.append("<a target='_blank' href='").append(model.getImgUrl()).append("' >查看图片<a/>");
+            });
+            detail.setOrderImgs(stringBuilder.toString());
         }
 
         return getDataTable(orderDetails);

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java

@@ -1293,6 +1293,23 @@ public class OrderMasterController extends BaseController {
             if(master.getExpectTimeStart() != null && master.getExpectTimeEnd() != null){
                 master.setMixExpectTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm",master.getExpectTimeStart()) +"-"+ DateUtils.parseDateToStr("HH:mm",master.getExpectTimeEnd()));
             }
+            if("01".equals(master.getConsultMode())){
+                master.setOrderMode("05");
+            } else if (StringUtils.isEmpty(master.getOrderMode())) {
+                master.setOrderMode("01");
+            }
+            List<OrderDetail> details = orderDetailService.selectByOrderMasterId(master.getId());
+            StringBuilder stringBuilder = new StringBuilder();
+            details.forEach(model->{
+                GoodsImgs param = new GoodsImgs();
+                param.setRemark(String.valueOf(model.getId()));
+                param.setImgType(ImgType.FINISH_IMG.getId());
+                List<GoodsImgs> imgsList = goodsImgsService.qryGoodsImgs(param);
+                imgsList.forEach(imgs->{
+                    stringBuilder.append("<a target='_blank' href='").append(imgs.getImgUrl()).append("' >查看图片<a/>");
+                });
+            });
+            master.setOrderImgs(stringBuilder.toString());
         }
         return getDataTable(orderMasterList);
     }

ghy-admin/src/main/resources/templates/order/master.html

@@ -698,7 +698,12 @@
                     field: 'changeMoney',
                     title: '商家追加金额',
                     align: 'center'
-                },{
+                },
+                {
+                    field: 'orderImgs',
+                    title: '完单图片'
+                },
+                {
                     field: 'orderType',
                     title: '订单类型',
                     align: 'center',

ghy-admin/src/main/resources/templates/order/orderManager.html

@@ -733,6 +733,11 @@
                     title: '商家追加金额',
                     align: 'center'
                 },
+                {
+                    field: 'orderImgs',
+                    title: '完单图片',
+                    align: 'center'
+                },
                 {
                     field: 'payMode',
                     title: '商家付费模式',

ghy-admin/src/main/resources/templates/order/pc-master.html

@@ -148,7 +148,7 @@
                         </div>
                         <div class="flex-board-no-wrap m-t">
                             <label class="form-control-label">订单查询：</label>
-                            <input type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
+                            <input name="keywords" id="keywords" type="text" class="form-control long-input m-r" placeholder="请输入订单号、姓名、电话或地址、品牌、规格">
                         </div>
                         <div class="m-t">
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
@@ -488,6 +488,10 @@
                     align: 'center',
                     visible: false
                 },
+                {
+                    field: 'orderImgs',
+                    title: '完单图片'
+                },
                 {
                     field: 'payMode',
                     title: '商家付费模式',

ghy-admin/src/main/resources/templates/order/pcOrderWorker.html

@@ -147,7 +147,12 @@
                     checkbox: true
                 }, {
                     field: 'name',
-                    title: '人员名称',
+                    title: '昵称',
+                    align: "left"
+                },
+                {
+                    field: 'realName',
+                    title: '真实姓名',
                     align: "left"
                 }, {
                     field: 'phone',

ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java

@@ -70,6 +70,9 @@ public class OrderDetail extends BaseEntity {
 
     // 接单师傅
     private Worker worker;
+
+    private String orderImgs;
+
     // 商品归属师傅
     private Worker goodsWorker;
     // 接单师傅

ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java

@@ -157,6 +157,8 @@ public class OrderMaster extends BaseEntity {
 
     private String orderMode;
 
+    private String orderImgs;
+
     private String payMode;
 
     private String isCharge;

ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java

@@ -290,7 +290,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
         }
 
         logger.info("订单[code={}]发起分账", orderMaster.getCode());
-        JSONObject response = adapayService.paymentConfirm(orderMaster.getDeptId(), payment.getId(), payment.getOrderNo(),
+        JSONObject response = adapayService.paymentConfirm(orderMaster.getDeptId(), payment.getId(), orderMaster.getCode() + System.currentTimeMillis(),
                 AdapayUtils.bigDecimalToString(confirmAmt), divMembers, null, null);
 
         boolean status = AdapayStatusEnum.pending.code.equals(response.getString("status")) ||

ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml

@@ -108,6 +108,8 @@
                 om.code LIKE concat('%', #{keyWords}, '%')
                 or ca.name LIKE concat('%', #{keyWords}, '%')
                 or ca.phone LIKE concat('%', #{keyWords}, '%')
+                or ca.address like concat('%', #{keyWords}, '%')
+                or g.goods_name like concat('%', #{keyWords}, '%')
                 )
             </if>
             <if test="deptId != null and deptId != ''">

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -104,7 +104,8 @@
                om.is_call,
                fm.server_money,
                om.goods_brand,
-               om.goods_specification
+               om.goods_specification,
+               om.consult_mode
         FROM order_master om
         LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
         LEFT JOIN goods g ON g.goods_id = om.goods_id
@@ -121,6 +122,8 @@
                 om.code LIKE concat('%', #{keywords}, '%')
                     or ca.name LIKE concat('%', #{keywords}, '%')
                     or ca.phone LIKE concat('%', #{keywords}, '%')
+                    or ca.address like  concat('%', #{keywords}, '%')
+                    or g.goods_name like concat('%', #{keywords}, '%')
                 )
             </if>
             <if test="workerName != null and workerName != ''">

ghy-worker/src/main/resources/mapper/worker/WorkerMapper.xml

@@ -62,6 +62,7 @@
             SELECT w.worker_id FROM worker w
             LEFT JOIN worker_area wa ON wa.worker_id = w.worker_id
             LEFT JOIN worker_goods_category wgc ON wgc.worker_id = w.worker_id
+            LEFT JOIN worker_certification wc on w.worker_id = wc.worker_id
             <where>
                 <if test="deptId != null and deptId != ''">
                     AND dept_id = #{deptId}
@@ -77,7 +78,8 @@
                 </if>
                 <if test="keyWords != null and keyWords != ''">
                     AND (w.name LIKE '%${keyWords}%'
-                    OR w.phone LIKE '%${keyWords}%')
+                    OR w.phone LIKE '%${keyWords}%'
+                    OR concat(wc.surname,'', wc.name) like '%${keyWords}%')
                 </if>
                 <if test="name != null and name != ''">
                     AND w.name LIKE '%${name}%'