需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/WorkerComListLogic.java

@@ -70,7 +70,7 @@ public class WorkerComListLogic {
             }
             comListIds = worker.stream().map(WorkerComListWorker::getWorkerComListId).distinct().collect(Collectors.toList());
         }else {
-            throw new RemoteServiceException("师傅编号未传");
+            return new Page<>();
         }
         IPage<WorkerComList> page = workerComListService.lambdaQuery()
                 .like(StringUtils.isNotEmpty(title), WorkerComList::getTitle, title)
@@ -92,7 +92,7 @@ public class WorkerComListLogic {
      */
     public List<CommonListES> record(String comListId, String workerNumber) {
         if (StringUtil.isEmpty(workerNumber))
-         throw new RemoteServiceException("师傅编号未传");
+            return new ArrayList<>();
         List<CommonListES> list = esLogic.list(Arrays.asList(workerNumber), workerNumber, comListId);
         return list;
     }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/withdrawal/WithdrawalLogic.java

@@ -59,7 +59,7 @@ public class WithdrawalLogic {
         List<SettlementOrder> list = settlementOrderService.lambdaQuery()
                 .eq(SettlementOrder::getStatus,SettlementStatusEnum.WAIT_ING.getKey())
                 .eq(SettlementOrder::getPayType, PayTypeEnum.WECHAT.getKey())
-                .eq(SettlementOrder::getWorkerId, workerId).list();
+                .eq(SettlementOrder::getUserId, currentCompanyWechat.getUserId()).list();
 
         if(CollectionUtils.isEmpty(list)){
             throw new RemoteServiceException("暂无可提现的单");
@@ -193,11 +193,12 @@ public class WithdrawalLogic {
      */
     public SettlementAmountBean totalAmount(String workerId,String websitId,List<SettlementOrder> list){
 
+        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         if(CollectionUtils.isEmpty(list)) {
             list = settlementOrderService.lambdaQuery()
                     //.eq(SettlementOrder::getStatus, SettlementStatusEnum.WAIT_ING.getKey())
                     .eq(SettlementOrder::getPayType, PayTypeEnum.WECHAT.getKey())
-                    .eq(SettlementOrder::getWorkerId, workerId).list();
+                    .eq(SettlementOrder::getWorker, workerId).list();
         }
         if(StringUtils.isNotBlank(websitId)){
             list = list.stream().filter(v -> StringUtils.equals(websitId,v.getWebsitId())).collect(Collectors.toList());

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -889,7 +889,7 @@ public class PayOrderLogic {
                 )
                 .eq(!StringUtil.isEmpty(payStatus) && payStatus.equals(MaterialExamineStatusEnum.PAID.getKey()),WorkerOrder::getRefundStatus, IsYesNoEnum.NO.getKey())
 
-                .eq(WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber())
+                .eq(WorkerOrder::getUserId,currentCompanyWechat.getUser().getUserId())
                 .between(!StringUtil.isEmpty(startTime),WorkerOrder::getCreateTime,startTime,endTime)
                 .in(WorkerOrder::getCompanyWechatId,currentCompanyWechat.getCompanyWechatId())
                 .orderByDesc(WorkerOrder::getCreateTime)

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderLogLogic.java

@@ -69,6 +69,7 @@ public class OrderLogLogic {
                     .set(PgOrderBase::getAppointmentTime, pgOrderOperatorLog.getAppointmentTime())
                     .set(PgOrderBase::getAppointmentEndTime, pgOrderOperatorLog.getAppointmentEndTime())
                     .set(PgOrderBase::getLastOperatorAppointmentTime, new Date())
+                    .set(PgOrderBase::getChangeRemark, pgOrderOperatorLog.getContent())
                     .eq(PgOrderBase::getId, pgOrderOperatorLog.getOrderBaseId())
                     .update();
         }

mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/UserVO.java

@@ -99,4 +99,8 @@ public class UserVO     {
     private String updateBy;
     @ApiModelProperty("修改时间")
     private Date updateTime;
+
+    @ZfireField(tbName = "c",hide = true)
+    @ApiModelProperty("网点属性 SELF=自建网点 MAJOR=第三方专业网点 MERCHANT=第三方经销商家网点")
+    private String attr;
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/policy/MailboxSendRecordPolicyVo.java

@@ -16,17 +16,15 @@ import java.util.Date;
 
 @ApiModel
 @Data
-public class MailboxSendRecordPolicyVo    {
+public class MailboxSendRecordPolicyVo     {
 
 
     @ZfireField(hide = true)
     @TableId(value = "id", type = IdType.ID_WORKER_STR)
     private String id;
-
     @ZfireField(hide = true)
     @ApiModelProperty(value = "商户名")
     private String companyWechatName;
-
     @ZfireField(hide = true)
     @ApiModelProperty(value = "商户id")
     private String companyWechatId;

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -494,14 +494,13 @@ public class AgreementLogic {
             for (PolicyOrder policyOrder : policyOrders) {
                 MailboxSendRecordPolicy mailboxSendRecordPolicy = new MailboxSendRecordPolicy();
 
-                mailboxSendRecordPolicy.setCompanyWechatId(mailboxSendRecord.getCompanyWechatId());
-                mailboxSendRecordPolicy.setCompanyWechatName(mailboxSendRecord.getCompanyWechatName());
-                mailboxSendRecordPolicy.setPolicyNumber(policyOrder.getPolicyId());
+                mailboxSendRecordPolicy.setCompanyWechatId(mailbox.getCompanyWechatId());
+                mailboxSendRecordPolicy.setCompanyWechatName(mailbox.getCompanyWechatName());
+                mailboxSendRecordPolicy.setPolicyNumber(policyOrder.getPolicyNumber());
                 mailboxSendRecordPolicy.setPolicyName(policyOrder.getWorkerName());
                 mailboxSendRecordPolicy.setWebsitName(policyOrder.getWebsitName());
                 mailboxSendRecordPolicy.setWebsitId(policyOrder.getWebsitId());
                 mailboxSendRecordPolicy.setPolicyMobile(policyOrder.getWorkerMobile());
-                mailboxSendRecordPolicy.setPolicyNumber(policyOrder.getWorkerNumber());
                 mailboxSendRecordPolicy.setPolicyIdcard(policyOrder.getWorkerIdcard());
                 mailboxSendRecordPolicy.setType("IN");
                 mailboxSendRecordPolicy.setSendBatch(mailboxSendRecord.getSendBatch());
@@ -808,6 +807,7 @@ public class AgreementLogic {
             }
 
             List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery()
+                    .eq(WorkerPolicy::getWebsitUserId,websitUser.getId())
                     .in(WorkerPolicy::getStatus, WorkerPolicyStatusEnum.BZZ.getKey(), WorkerPolicyStatusEnum.DSX.getKey())
                     .list();
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/PolicyOrderLogic.java

@@ -119,11 +119,13 @@ public class PolicyOrderLogic {
         }
         policyOrder.updateById();
 
-        if (policyOrder.getPolicyOrderStatus().equals(PolicyOrderStatusEnum.BZZ.getKey()) || policyOrder.getPolicyOrderStatus().equals(PolicyOrderStatusEnum.DSX.getKey())) {
+        if (policyOrder.getPolicyOrderStatus().equals(PolicyOrderStatusEnum.BZZ.getKey()) ||
+                policyOrder.getPolicyOrderStatus().equals(PolicyOrderStatusEnum.DSX.getKey())) {
 
             WorkerPolicy workerPolicy = new WorkerPolicy();
-            workerPolicy.setWorkerId(policyOrder.getWorkerNumber());
-            workerPolicy.setType("LINE");
+            workerPolicy.setWorkerNumber(policyOrder.getWorkerNumber());
+            workerPolicy.setWorkerId(policyOrder.getWebsitUserId());
+            workerPolicy.setType("IN");
             workerPolicy.setOrderId(policyOrder.getId());
             workerPolicy.setPolicyName(policyOrder.getPolicyName());
             workerPolicy.setCompany(policyOrder.getBelongCompany());

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderLogLogic.java

@@ -74,7 +74,7 @@ public class OrderLogLogic {
                 .eq(StringUtils.isNotBlank(adminUser.getCompanyWechatId()),
                         PgOrderOperatorLog::getCompanyWechatId,
                         adminUser.getCompanyWechatId())
-                .orderByDesc(PgOrderOperatorLog::getCreateTime)
+                .orderByDesc(PgOrderOperatorLog::getCreateTime,PgOrderOperatorLog::getId)
                 .list();
         return list;
     }
@@ -389,7 +389,7 @@ public class OrderLogLogic {
 
             //公众号通知
             wxPubNoticeLogic.addDispatch(pgOrderWorker.getWorkerMobile(),pgOrderBase.getCompanyWechatId(),pgOrderBase.getOrderTypeText(),
-                    pgOrderBase.getId(),pgOrderBase.getAppointmentTime() == null ? pgOrderBase.getDispatchTime():pgOrderBase.getAppointmentTime(), text,
+                    pgOrderBase.getId(),pgOrderBase.getDispatchTime(), text,
                     StringUtils.isBlank(pgOrderBase.getAddress())?pgOrderBase.getGpsAddress():pgOrderBase.getAddress());
         }
 

mall-server-api/src/main/resources/mapper/workorder/OrderBaseCMapper.xml

@@ -115,7 +115,7 @@
             count(if(order_status in ('DQD'),1,null)) as 'dqd',
             count(if(order_status in ('FWZ'),1,null)) as 'fwz',
             count(if(appointment_time is null and a.order_status in('DYY','DSHPG','DWDPG','DJD'),1,null)) as 'dyy',
-            count(if(is_exception = 1,1,null)) as 'ycdcl',
+            count(if(is_exception = 1 and a.order_status not in  ('YWG','YWGO','YJS'),1,null)) as 'ycdcl',
             count(if(appraise_status in ('C'),1,null)) as 'cp'
         from pg_order_base a
         where 1=1