no message

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

@@ -34,6 +34,9 @@ public class UserVO {
     @ApiModelProperty("网点名称")
     private String websitName;
 
+    @ApiModelProperty("师傅编号")
+    private String workerNumber;
+
     @ApiModelProperty("用户昵称")
     private String nickName;
 

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

@@ -7,14 +7,11 @@ import com.gree.mall.manager.annotation.ZfireList;
 import com.gree.mall.manager.bean.listvo.User2VO;
 import com.gree.mall.manager.bean.listvo.UserCustomerVO;
 import com.gree.mall.manager.bean.listvo.UserVO;
-import com.gree.mall.manager.bean.listvo.param.UserZfireParamBean;
 import com.gree.mall.manager.bean.listvo.workorder.UserWaitVO;
-import com.gree.mall.manager.bean.material.base.WebsitNormChargeVO;
 import com.gree.mall.manager.bean.member.UserApplyBean;
 import com.gree.mall.manager.bean.user.UserApplyWorkerBean;
 import com.gree.mall.manager.bean.user.UserWxBean;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
-import com.gree.mall.manager.enums.UserTypeEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
 import com.gree.mall.manager.helper.ResponseHelper;
 import com.gree.mall.manager.logic.goods.GoodsLogic;
@@ -35,7 +32,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.Response;
 import java.io.IOException;
 import java.util.List;
 
@@ -75,7 +71,6 @@ public class MemberController {
     }
 
 
-
     @ZfireList
     @PostMapping("/list/page2")
     @ApiOperation(value = "师傅列表-v2")
@@ -83,7 +78,8 @@ public class MemberController {
             @RequestBody ZfireParamBean zfireParamBean
     ) throws RemoteServiceException {
         IPage<UserVO> page = userLogic.page2(zfireParamBean);
-        return ResponseHelper.success(page, new TypeReference<UserVO>() {});
+        return ResponseHelper.success(page, new TypeReference<UserVO>() {
+        });
     }
 
     @PostMapping("/list/page2/export")
@@ -107,7 +103,8 @@ public class MemberController {
             @RequestBody ZfireParamBean zfireParamBean
     ) throws RemoteServiceException {
         IPage<User2VO> page = userLogic.userServiceList(zfireParamBean);
-        return ResponseHelper.success(page,new TypeReference<User2VO>() {});
+        return ResponseHelper.success(page, new TypeReference<User2VO>() {
+        });
     }
 
 
@@ -132,7 +129,8 @@ public class MemberController {
             @RequestBody ZfireParamBean zfireParamBean
     ) throws RemoteServiceException {
         IPage<UserWaitVO> page = userLogic.userWaitList(zfireParamBean);
-        return ResponseHelper.success(page,new TypeReference<UserWaitVO>() {});
+        return ResponseHelper.success(page, new TypeReference<UserWaitVO>() {
+        });
     }
 
     @PostMapping("/list/wait2/del")
@@ -158,23 +156,23 @@ public class MemberController {
     @PostMapping("/worker/update")
     @ApiOperation("修改师傅资料")
     public ResponseHelper workerUpdate(
-            @ApiParam("userId")@RequestParam String userId,
-            @ApiParam("网点id")@RequestParam String websitId,
-            @ApiParam(value = "师傅名称",required = false)@RequestParam(required = false) String name,
-            @ApiParam(value = "身份证号",required = false) @RequestParam(required = false) String idCard,
-            @ApiParam(value = "身份证图片",required = false)@RequestParam(required = false) String idCardImg,
-            @ApiParam(value="银行卡",required = false)@RequestParam(required = false) String bankAccount,
-            @ApiParam(value = "设置师傅二手商品发布权限true=启用 false=禁用") @RequestParam Boolean isEs
-    ){
-        userLogic.updateWorker(userId,websitId,name,idCard,idCardImg,bankAccount,isEs);
+            @ApiParam(value = "userId", required = true) @RequestParam String userId,
+            @ApiParam(value = "网点id", required = true) @RequestParam String websitId,
+            @ApiParam(value = "师傅名称", required = false) @RequestParam(required = false) String name,
+            @ApiParam(value = "身份证号", required = false) @RequestParam(required = false) String idCard,
+            @ApiParam(value = "身份证图片", required = false) @RequestParam(required = false) String idCardImg,
+            @ApiParam(value = "银行卡", required = false) @RequestParam(required = false) String bankAccount,
+            @ApiParam(value = "设置师傅二手商品发布权限true=启用 false=禁用") @RequestParam Boolean isEs,
+            @ApiParam(value = "师傅编号", required = true) @RequestParam String workerNumber
+            ) {
+        userLogic.updateWorker(userId, websitId, name, idCard, idCardImg, bankAccount, isEs, workerNumber);
         return ResponseHelper.success();
     }
 
 
-
     @GetMapping("worker/examine/detail")
     @ApiOperation("师傅审核详情")
-    public ResponseHelper<UserApplyWorkerBean> workerExamineDetail(@RequestParam String id){
+    public ResponseHelper<UserApplyWorkerBean> workerExamineDetail(@RequestParam String id) {
         UserApplyWorkerBean bean = userLogic.workerExamineDetail(id);
         return ResponseHelper.success(bean);
     }
@@ -183,11 +181,11 @@ public class MemberController {
     @ApiOperation(value = "工程师审核-v2")
     public ResponseHelper examineWorker(
             @RequestParam String id,
-            @ApiParam("审核状态 OK=通过 FAIL=驳回 ")@RequestParam ExamineStatusEnum examineStatusEnum,
-            @ApiParam(value = "审核备注",required = false) @RequestParam(required = false) String examineRemark
-    ){
+            @ApiParam("审核状态 OK=通过 FAIL=驳回 ") @RequestParam ExamineStatusEnum examineStatusEnum,
+            @ApiParam(value = "审核备注", required = false) @RequestParam(required = false) String examineRemark
+    ) {
         //userLogic.
-        userLogic.examine(id,examineStatusEnum,examineRemark);
+        userLogic.examine(id, examineStatusEnum, examineRemark);
         return ResponseHelper.success();
     }
 
@@ -195,11 +193,11 @@ public class MemberController {
     @ApiOperation(value = "分销员审核-v2")
     public ResponseHelper examineShare(
             @ApiParam("用户id") @RequestParam String userId,
-            @ApiParam("审核状态 OK=通过 FAIL=驳回 ")@RequestParam ExamineStatusEnum examineStatusEnum,
-            @ApiParam(value = "审核备注",required = false) @RequestParam(required = false) String examineRemark
-    ){
+            @ApiParam("审核状态 OK=通过 FAIL=驳回 ") @RequestParam ExamineStatusEnum examineStatusEnum,
+            @ApiParam(value = "审核备注", required = false) @RequestParam(required = false) String examineRemark
+    ) {
         //userLogic.
-        userLogic.shareExamine(userId,examineStatusEnum,examineRemark);
+        userLogic.shareExamine(userId, examineStatusEnum, examineRemark);
         return ResponseHelper.success();
     }
 
@@ -207,10 +205,10 @@ public class MemberController {
     @PostMapping("/batch/inner")
     @ApiOperation(value = "批量设置或取消内部分销员-v2")
     public ResponseHelper batchInner(
-           @ApiParam(value = "true=内部分销员 false=取消内部分销员") @RequestParam Boolean innerr,
-           @ApiParam(value = "用户id集合，逗号隔开") @RequestParam List<String> userIds
-    ){
-        userLogic.batchInner(userIds,innerr);
+            @ApiParam(value = "true=内部分销员 false=取消内部分销员") @RequestParam Boolean innerr,
+            @ApiParam(value = "用户id集合，逗号隔开") @RequestParam List<String> userIds
+    ) {
+        userLogic.batchInner(userIds, innerr);
         return ResponseHelper.success();
     }
 
@@ -219,7 +217,7 @@ public class MemberController {
     @ApiOperation(value = "批量设置用户类型-v2")
     public ResponseHelper batchType(
             @RequestBody UserApplyBean userApplyBean
-            ){
+    ) {
         userLogic.batchType(userApplyBean);
         return ResponseHelper.success();
     }
@@ -230,33 +228,31 @@ public class MemberController {
     public ResponseHelper batchEs(
             @ApiParam(value = "true=启用 false=禁用") @RequestParam Boolean isEs,
             @ApiParam(value = "用户id集合，逗号隔开") @RequestParam List<String> userIds
-    ){
-        userLogic.batchEs(userIds,isEs);
+    ) {
+        userLogic.batchEs(userIds, isEs);
         return ResponseHelper.success();
     }
 
 
-
-
     @GetMapping("/list/page")
     @ApiOperation(value = "会员列表")
     public ResponseHelper<Page<User>> page(HttpServletRequest request,
-            @ApiParam(value = "名称/电话") @RequestParam(required = false) String keyword,
-            @ApiParam(value = "用户角色,GENERAL=普通用户 SERVICE=业务员") @RequestParam(required = false) String type,
-            @ApiParam(value = "是否为团长(true=是 false=否)") @RequestParam(required = false) Boolean promotionGroupLeader,
-            @ApiParam(value = "是否为内部人员(true=是 false=否)") @RequestParam(required = false) Boolean innerr,
-            @ApiParam(value = "网点id", required = false) @RequestParam(required = false) String websitId,
-            @ApiParam(value = "是否有优惠码权限") @RequestParam(required = false) Boolean isExchangeCode,
-            @ApiParam(value = "注册开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(value = "注册结束时间") @RequestParam(required = false) String endTime,
-            @ApiParam(value = "排序json格式[{sortColumn: 'ID', type: true },...] " +
-                    "sortColumn:会员排序对应值 ID=编号 SEX=性别 CREATE=注册时间 STATUS=状态, " +
-                    "type: true=升序 false=倒序")
-            @RequestParam(required = false) String sortJson,
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
+                                           @ApiParam(value = "名称/电话") @RequestParam(required = false) String keyword,
+                                           @ApiParam(value = "用户角色,GENERAL=普通用户 SERVICE=业务员") @RequestParam(required = false) String type,
+                                           @ApiParam(value = "是否为团长(true=是 false=否)") @RequestParam(required = false) Boolean promotionGroupLeader,
+                                           @ApiParam(value = "是否为内部人员(true=是 false=否)") @RequestParam(required = false) Boolean innerr,
+                                           @ApiParam(value = "网点id", required = false) @RequestParam(required = false) String websitId,
+                                           @ApiParam(value = "是否有优惠码权限") @RequestParam(required = false) Boolean isExchangeCode,
+                                           @ApiParam(value = "注册开始时间") @RequestParam(required = false) String startTime,
+                                           @ApiParam(value = "注册结束时间") @RequestParam(required = false) String endTime,
+                                           @ApiParam(value = "排序json格式[{sortColumn: 'ID', type: true },...] " +
+                                                   "sortColumn:会员排序对应值 ID=编号 SEX=性别 CREATE=注册时间 STATUS=状态, " +
+                                                   "type: true=升序 false=倒序")
+                                           @RequestParam(required = false) String sortJson,
+                                           @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
+                                           @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) throws RemoteServiceException {
-        IPage<User> page = userLogic.page(request,keyword, type,promotionGroupLeader,innerr, startTime, endTime, sortJson,websitId,isExchangeCode, pageNum, pageSize);
+        IPage<User> page = userLogic.page(request, keyword, type, promotionGroupLeader, innerr, startTime, endTime, sortJson, websitId, isExchangeCode, pageNum, pageSize);
         return ResponseHelper.success(page);
     }
 
@@ -271,7 +267,7 @@ public class MemberController {
                        @ApiParam(value = "注册开始时间") @RequestParam(required = false) String startTime,
                        @ApiParam(value = "注册结束时间") @RequestParam(required = false) String endTime
     ) throws Exception {
-        userLogic.export(request, response, keyword, type,websitId, startTime, endTime);
+        userLogic.export(request, response, keyword, type, websitId, startTime, endTime);
     }
 
 
@@ -285,7 +281,6 @@ public class MemberController {
     }
 
 
-
     @PostMapping("/updateUserInnerStatus")
     @ApiOperation(value = "修改会员内部人员状态")
     public ResponseHelper updateUserInnerStatus(
@@ -301,7 +296,7 @@ public class MemberController {
     @ApiOperation(value = "内部人员批量设置模板")
     public ResponseHelper downLoadUserInnerTimplate(HttpServletResponse response)
             throws RemoteServiceException, IOException {
-        CommonUtils.downloadFile("/static/用户批量设置内部人员模板.xlsx",response);
+        CommonUtils.downloadFile("/static/用户批量设置内部人员模板.xlsx", response);
         return ResponseHelper.success();
     }
 
@@ -321,7 +316,7 @@ public class MemberController {
             @ApiParam(value = "用户id", required = true) @RequestParam String userId,
             @ApiParam(value = "true=设置 false=取消", required = true) @RequestParam Boolean promotionGroupLeader
     ) throws RemoteServiceException {
-        userLogic.groupleader(userId,promotionGroupLeader);
+        userLogic.groupleader(userId, promotionGroupLeader);
         return ResponseHelper.success();
     }
 
@@ -343,12 +338,11 @@ public class MemberController {
             @ApiParam(value = "师傅id", required = true) @RequestParam String userId,
             @ApiParam(value = "辅助师傅id", required = true) @RequestParam String slaveUserId
     ) {
-        userLogic.bindSlaveWorker(websitId,userId, slaveUserId);
+        userLogic.bindSlaveWorker(websitId, userId, slaveUserId);
         return ResponseHelper.success();
     }
 
 
-
     @GetMapping("/detail")
     @ApiOperation(value = "用户详情")
     public ResponseHelper<UserWxBean> detail(
@@ -361,10 +355,10 @@ public class MemberController {
     @PostMapping("/updateNickName")
     @ApiOperation(value = "修改会员昵称")
     public ResponseHelper<Void> updateNickName(
-            @ApiParam(value = "用户id",required = true)@RequestParam String userId,
-            @ApiParam(value = "新昵称",required = true)@RequestParam String newNickName
-    ){
-        userLogic.updateUserNickName(userId,newNickName);
+            @ApiParam(value = "用户id", required = true) @RequestParam String userId,
+            @ApiParam(value = "新昵称", required = true) @RequestParam String newNickName
+    ) {
+        userLogic.updateUserNickName(userId, newNickName);
         return ResponseHelper.success();
     }
 
@@ -415,9 +409,9 @@ public class MemberController {
     @GetMapping("/wx/list")
     @ApiOperation(value = "客户列表")
     public ResponseHelper wxCustomerList(HttpServletRequest request,
-            @ApiParam(required = true, value = "用户id") @RequestParam(required = true) String userId) throws WxErrorException {
+                                         @ApiParam(required = true, value = "用户id") @RequestParam(required = true) String userId) throws WxErrorException {
 
-        return ResponseHelper.success(userLogic.wxCustomerList(request,userId));
+        return ResponseHelper.success(userLogic.wxCustomerList(request, userId));
     }
 
 }

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

@@ -174,20 +174,21 @@ public class UserLogic {
 
     /**
      * 修改师傅资料
-     *
-     * @param userId
+     *  @param userId
      * @param websitId
      * @param name
      * @param idCard
      * @param idCardImg
      * @param bankAccount
+     * @param workerNumber
      */
     @Transactional
-    public void updateWorker(String userId, String websitId, String name, String idCard, String idCardImg, String bankAccount, Boolean isEs) {
+    public void updateWorker(String userId, String websitId, String name, String idCard, String idCardImg, String bankAccount, Boolean isEs, String workerNumber) {
         WebsitUser websitUser = websitUserService.lambdaQuery()
                 .eq(WebsitUser::getUserId, userId)
                 .eq(WebsitUser::getWebsitId, websitId).last("limit 1").one();
         websitUser.setBankAccount(bankAccount);
+        websitUser.setWorkerNumber(workerNumber);
         websitUser.updateById();
 
         User user = userService.getById(userId);

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gree.mall.manager.commonmapper.CommonMapper">
+    <update id="settleBankAccountList"></update>
 
 
     <select id="queryChargingStandrdList" resultType="com.gree.mall.manager.bean.charging.ChargingStandardBean">
@@ -88,6 +89,7 @@
         select
         ${ex.selected},
         b.websit_id,
+        b.worker_number,
         c.name as 'websit_name',
         d.nick_name as 'slaveWorkerName'
         from user a
@@ -1039,6 +1041,18 @@
         </if>
         ${ex.orderBy}
     </select>
+    <select id="repairSettleBankAccountList"
+            resultType="com.gree.mall.manager.bean.settle.repair.DailyBankAccountVO">
+        SELECT
+            ${ex.selected}
+        FROM
+            settle_daily_bank_account a
+        ${ex.query}
+        <if test="ex.orderBy == null or ex.orderBy ==''">
+            ORDER BY a.create_time DESC
+        </if>
+        ${ex.orderBy}
+    </select>
 
 
 </mapper>