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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/MyDataCountBean.java

@@ -34,6 +34,9 @@ public class MyDataCountBean {
     @ApiModelProperty(value = "已返还")
     private Integer endRefundCount;
 
+    @ApiModelProperty(value = "已提交")
+    private Integer saveCount;
+
     @ApiModelProperty(value = "待支付")
     private Integer waitPayCount;
 

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

@@ -17,6 +17,7 @@ import com.gree.mall.miniapp.enums.PayOrderTypeEnum;
 import com.gree.mall.miniapp.enums.PayTypeEnum;
 import com.gree.mall.miniapp.enums.material.WebsitGoodsTypeEnum;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
+import com.gree.mall.miniapp.helper.ResponseHelper;
 import com.gree.mall.miniapp.logic.common.AllInPayLogic;
 import com.gree.mall.miniapp.logic.common.CommonLogic;
 import com.gree.mall.miniapp.logic.common.outside.WechatLogic;
@@ -177,6 +178,10 @@ public class WebsitSalesLogic {
                 .eq(WebsitSales::getWorkerId, wechat.getUserId())
                 .eq(WebsitSales::getFlag, "PAY_TAKE")
                 .count());
+        bean.setSaveCount(websitSalesService.lambdaQuery()
+                .eq(WebsitSales::getWorkerId, wechat.getUserId())
+                .eq(WebsitSales::getFlag, "SAVE")
+                .count());
 
         return bean;
     }
@@ -320,7 +325,7 @@ public class WebsitSalesLogic {
         CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat(request);
 
         if (StringUtils.isBlank(wechat.getUser().getMobile())) {
-            throw new RemoteServiceException("未发现手机号, 不能提交订单");
+            throw new RemoteServiceException(ResponseHelper.ResponseCode_NOT_PHONE, "未发现手机号, 不能提交订单");
         }
 
         List<WebsitShoppingCartList> shoppingCartLists = this.queryShoppingCart(wechat.getUserId(), websitId, goodsType);

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

@@ -24,6 +24,10 @@ public class User2VO {
     @ApiModelProperty("商户名称")
     private String companyName;
 
+    @ZfireField(tbName = "b")
+    @ApiModelProperty("师傅编号")
+    private String workerNumber;
+
     @ApiModelProperty("用户昵称")
     private String nickName;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/member/UserApplyBean.java

@@ -19,6 +19,8 @@ import java.util.List;
 public class UserApplyBean {
     @ApiModelProperty("用户id")
     private String userId;
+    @ApiModelProperty("师傅编号")
+    private String workerNumber;
     @ApiModelProperty("师傅名称")
     private String name;
     @ApiModelProperty("类型 SERVICE=分销员 WORKER=师傅")

mall-server-api/src/main/java/com/gree/mall/manager/controller/member/MemberController.java

@@ -185,7 +185,6 @@ public class MemberController {
 //            @ApiParam("审核状态 OK=通过 FAIL=驳回 ") @RequestParam ExamineStatusEnum examineStatusEnum,
 //            @ApiParam(value = "审核备注", required = false) @RequestParam(required = false) String examineRemark
     ) {
-        //userLogic.
         userLogic.updateWorker(bean.getUserId(), bean.getWebsitId(), bean.getNickName(), bean.getIdCard(), bean.getIdCardImg(),
                 bean.getBankAccount(), bean.getIsEs(), bean.getWorkerNumber());
         userLogic.examine(bean.getId(), bean.getExamineStatus(), bean.getExamineRemark());

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -460,8 +460,11 @@ public class AdminWebsitLogic {
 
     public List<AdminWebsitPayConfig> payConfigList(String websitId, String type, Boolean status) {
         final AdminUserCom adminUser = commonLogic.getAdminUser();
+        if (Objects.isNull(adminUser.getAdminCompanyWechat())) {
+            throw new RemoteServiceException("请使用商户账号发现支付");
+        }
         return adminWebsitPayConfigService.lambdaQuery()
-                .eq(Objects.nonNull(adminUser.getAdminCompanyWechat()), AdminWebsitPayConfig::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
+                .eq(AdminWebsitPayConfig::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
                 .eq(StringUtils.isNotBlank(websitId), AdminWebsitPayConfig::getWebsitId, websitId)
                 .eq(StringUtils.isNotBlank(type), AdminWebsitPayConfig::getType, type)
                 .eq(Objects.nonNull(status), AdminWebsitPayConfig::getStatus, status)

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/base/MaterialCategoryLogic.java

@@ -41,11 +41,12 @@ public class MaterialCategoryLogic {
     public void add(WebsitGoodsCategory category) {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
-        String companyWechatId = null;
-        if (Objects.nonNull(adminUser.getAdminCompanyWechat())) {
-            companyWechatId = adminUser.getAdminCompanyWechat().getCompanyWechatId();
+        if (Objects.isNull(adminUser.getAdminCompanyWechat())) {
+           throw new RemoteServiceException("平台账号禁止操作");
         }
 
+        String companyWechatId = adminUser.getAdminCompanyWechat().getCompanyWechatId();
+
         if (Objects.isNull(category.getCategoryLevel())) {
             throw new RemoteServiceException("级别不能为空");
         }

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

@@ -68,8 +68,12 @@ public class DailyWithholdLogic {
     public SysDictCompany getConfig() {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
+        if (Objects.isNull(adminUser.getAdminCompanyWechat())) {
+            throw new RemoteServiceException("平台账号获取不到对应商户”结算汇总暂扣款比例“配置");
+        }
+
         SysDictCompany dict = sysDictCompanyService.lambdaQuery()
-                .eq(Objects.nonNull(adminUser.getAdminCompanyWechat()), SysDictCompany::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
+                .eq(SysDictCompany::getCompanyWechatId, adminUser.getAdminCompanyWechat().getCompanyWechatId())
                 .eq(SysDictCompany::getDictCode, SysDictConstant.REPAIR_DAILY)
                 .last("limit 1")
                 .one();

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -194,7 +194,7 @@ public class UserLogic {
                 .eq(AdminWebsit::getCompanyWechatId, adminUser.getCompanyWechatId())
                 .eq(AdminWebsit::getType, AdminWebsitTypeEnum.C.getKey())
                 .list();
-        Map<String, AdminWebsit> websitMap = list.stream().collect(Collectors.toMap(v -> v.getName(), Function.identity()));
+        Map<String, AdminWebsit> websitMap = list.stream().collect(Collectors.toMap(AdminWebsit::getName, Function.identity()));
         int index = 0;
         //先删除
         userWaitService.lambdaUpdate().eq(UserWait::getCompanyWechatId, adminUser.getCompanyWechatId()).remove();
@@ -241,7 +241,7 @@ public class UserLogic {
                 //入驻已存在的师傅到网点
                 User worker = userService.lambdaQuery().eq(User::getMobile, mobile).eq(User::getType, UserTypeEnum.WORKER.getKey()).last("limit 1").one();
                 if (worker != null) {
-                    this.saveWebsitUser(adminWebsit.getWebsitId(), worker, bankAccount, "系统导入初始化");
+                    this.saveWebsitUser(adminWebsit.getWebsitId(), worker, bankAccount, workerNumber, "系统导入初始化");
                 }
             }
             userWait.setName(name);
@@ -406,7 +406,7 @@ public class UserLogic {
         if (StringUtils.isNotBlank(websitId)) {
 
             User user = userService.getById(userId);
-            this.saveWebsitUser(websitId, user, userApplyBean.getBankAccount(), "系统手动设置");
+            this.saveWebsitUser(websitId, user, userApplyBean.getBankAccount(), userApplyBean.getWorkerNumber(), "系统手动设置");
         }
 
         userService.lambdaUpdate()
@@ -435,7 +435,7 @@ public class UserLogic {
     }
 
     @Transactional
-    public void saveWebsitUser(String websitId, User user, String bankAccount, String remark) {
+    public void saveWebsitUser(String websitId, User user, String bankAccount, String workerNumber, String remark) {
         websitUserService.lambdaUpdate().eq(WebsitUser::getUserId, user.getUserId()).eq(WebsitUser::getWebsitId, websitId).remove();
         WebsitUser websitUser = new WebsitUser();
         websitUser.setWebsitId(websitId);
@@ -445,6 +445,7 @@ public class UserLogic {
         websitUser.setExamineStatus(ExamineStatusEnum.OK.toString());
         websitUser.setExamineRemark(remark);
         websitUser.setBankAccount(bankAccount);
+        websitUser.setWorkerNumber(workerNumber);
         websitUser.insert();
     }