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

mall-server-api/src/main/java/com/gree/mall/manager/bean/workorder/PgAppraiseApplyVO.java

@@ -84,8 +84,8 @@ public class PgAppraiseApplyVO {
     @ApiModelProperty(value = "申诉时间")
     private Date applyTime;
 
-    @ApiModelProperty(value = "审核结果 ")
-    private String examineResult;
+    @ApiModelProperty(value = "审核结果")
+    private AppraiseStatusEnum examineResult;
 
     @ApiModelProperty(value = "中心判定网点")
     private AppraiseOnusEnum websitResult;

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/WorkerSettleExpenseLogic.java

@@ -52,6 +52,7 @@ public class WorkerSettleExpenseLogic {
     private final SettleMonthWagesWorkerService settleMonthWagesWorkerService;
     private final CountMapper countMapper;
     private final AdminWebsitService adminWebsitService;
+    private final WebsitUserService websitUserService;
 
     public IPage<SettleExpenseVO> gatherList(ZfireParamBean zfireParamBean) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
@@ -128,7 +129,7 @@ public class WorkerSettleExpenseLogic {
         String companyWechatId = adminUser.getAdminCompanyWechat().getCompanyWechatId();
         String companyWechatName = adminUser.getAdminCompanyWechat().getCompanyName();
 
-        Map<String, User> userMap = this.getUserMap(companyWechatId);
+
 
         List<AdminWebsit> websitList = adminWebsitService.lambdaQuery()
                 .in(AdminWebsit::getWebsitId, adminUser.getAdminWebsitIds())
@@ -146,6 +147,8 @@ public class WorkerSettleExpenseLogic {
             }
             final AdminWebsit websit = websitMap.get(item.getWebsitId());
 
+            Map<String, User> userMap = this.getUserMap(companyWechatId, websit.getWebsitId());
+
             item.setCompanyWechatId(companyWechatId)
                     .setCompanyWechatName(companyWechatName)
                     .setWebsitName(websit.getName())
@@ -503,10 +506,19 @@ public class WorkerSettleExpenseLogic {
 //        }
     }
 
-    private Map<String, User> getUserMap(String companyWechatId) {
+    private Map<String, User> getUserMap(String companyWechatId, String websitId) {
+        final List<WebsitUser> websitUserList = websitUserService.lambdaQuery()
+                .select(WebsitUser::getUserId)
+                .eq(WebsitUser::getWebsitId, websitId)
+                .list();
+
+        if (CollectionUtil.isEmpty(websitUserList)) {
+            throw new RemoteServiceException(websitId + "暂无师傅信息");
+        }
         final List<User> userList = userService.lambdaQuery()
                 .eq(User::getCompanyWechatId, companyWechatId)
                 .eq(User::getType, UserTypeEnum.WORKER.getKey())
+                .in(User::getUserId, websitUserList.stream().map(WebsitUser::getUserId).collect(Collectors.toList()))
                 .list();
         if (CollectionUtil.isEmpty(userList)) {
             throw new RemoteServiceException("系统暂无师傅信息");
@@ -537,7 +549,9 @@ public class WorkerSettleExpenseLogic {
                // .setWebsitId(adminUser.getAdminWebsit().getWebsitId())
               //  .setWebsitName(adminUser.getAdminWebsit().getName());
 
-        Map<String, User> userMap = this.getUserMap(companyWechatId);
+        SettleExpense settleExpense = settleExpenseService.getById(item.getSettleExpenseId());
+
+        Map<String, User> userMap = this.getUserMap(companyWechatId, settleExpense.getWebsitId());
 
         this.checkRequireParams(null, item, userMap, item.getId());
 
@@ -592,7 +606,7 @@ public class WorkerSettleExpenseLogic {
                 settleAmount = settleAmount.add(expenseItem.getWorkerSettleAmount2());
             }
         }
-        SettleExpense settleExpense = settleExpenseService.getById(item.getSettleExpenseId());
+        settleExpense = settleExpenseService.getById(item.getSettleExpenseId());
         settleExpense.setSettleAmount(settleAmount)
                 .setSettleByCount(byCount.size())
                 .setSettleOrderCount(itemList.size())

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

@@ -361,8 +361,8 @@ public class AppraiseRelaLogic {
         if (StringUtils.isBlank(bean.getCategoryId())) {
             throw new RemoteServiceException("请选择问题小类");
         }
-        if (StringUtils.isBlank(bean.getExamineResult())) {
-            throw new RemoteServiceException("审核备注");
+        if (StringUtils.isBlank(bean.getExamineRemark())) {
+            throw new RemoteServiceException("请填写审核备注");
         }
         if (Objects.isNull(bean.getIsWebsitCall())) {
             throw new RemoteServiceException("请选择网点是否指引用户接听400回访电话");
@@ -381,6 +381,7 @@ public class AppraiseRelaLogic {
                 .setParentCategoryName(parentCategory.getName())
                 .setCategoryId(bean.getCategoryId())
                 .setCategoryName(category.getName())
+                .setExamineRemark(bean.getExamineRemark())
                 .setExamineResult(bean.getExamineResult())
                 .setIsWebsitCall(bean.getIsWebsitCall())
                 .setWebsitResult(bean.getWebsitResult())