Merge remote-tracking branch 'origin/dev' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderCheckLogEditBo.java

@@ -71,4 +71,7 @@ public class TopOldOrderCheckLogEditBo {
 
     @ApiModelProperty("审核结果：1同意，-1拒绝")
     private Integer checkResult;
+
+    @ApiModelProperty("审核角色名称")
+    private String checkRoleName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderService.java

@@ -129,4 +129,6 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 	boolean updateOrderInfo(TopOldOrderAddBo bo);
 
 	boolean editOrderBrokerage(OrderBrokerageBo bo);
+
+	void informRemindOrderCheck(String result);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderCheckLogServiceImpl.java

@@ -181,6 +181,19 @@ public class TopOldOrderCheckLogServiceImpl extends ServiceImpl<TopOldOrderCheck
                     .eq(TopOldOrderCheckLog::getCheckSort, checkLog.getCheckSort() + 1)
                     .eq(TopOldOrderCheckLog::getCheckFrom, checkLog.getCheckFrom()));
         } else {
+            String checkFrom = "";
+            if(checkLog.getCheckFrom()==2){
+                checkFrom = "机构分成";
+            }
+            else if(checkLog.getCheckFrom()==3){
+                checkFrom = "业务员提成";
+            }
+            else if(checkLog.getCheckFrom()==4){
+                checkFrom = "佣金结算";
+            }
+            //抄送总经理
+            //消息通知
+            iTopOldOrderService.informRemindOrderCheck(String.format("【%s】订单"+checkFrom+"已通过【%s】审核",checkLog.getOrderSn(),bo.getLoginName()));
             //最后一个审核
             //进入支付流程
             TopOldOrderCheckLog check = getOne(new LambdaQueryWrapper<TopOldOrderCheckLog>()

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -1526,6 +1526,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
     }
 
+    @Override
     public void informRemindOrderCheck(String result) {
         //订单审核结果通知
         List<InformRemindRelevance> remindRelevances = informRemindRelevanceService.list(new LambdaQueryWrapper<InformRemindRelevance>().eq(InformRemindRelevance::getType, 2));