分销提成功能迭代更新

fuint-application/src/main/java/com/fuint/common/param/CommissionRuleItemParam.java

@@ -0,0 +1,31 @@
+package com.fuint.common.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 分销提成规则项目请求参数
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Data
+public class CommissionRuleItemParam implements Serializable {
+
+    @ApiModelProperty("商品ID")
+    private Integer goodsId;
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+
+    @ApiModelProperty("提成方式")
+    private String method;
+
+    @ApiModelProperty("散客值")
+    private BigDecimal visitorVal;
+
+    @ApiModelProperty("会员值")
+    private BigDecimal memberVal;
+
+}

fuint-application/src/main/java/com/fuint/common/param/CommissionRuleParam.java

@@ -0,0 +1,49 @@
+package com.fuint.common.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 分销提成规则请求参数
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Data
+public class CommissionRuleParam implements Serializable {
+
+    @ApiModelProperty("自增ID")
+    private Integer id;
+
+    @ApiModelProperty("规则名称")
+    private String name;
+
+    @ApiModelProperty("分佣类型,member:会员分销；staff：员工提成")
+    private String type;
+
+    @ApiModelProperty("分佣对象")
+    private String target;
+
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
+
+    @ApiModelProperty("店铺ID")
+    private Integer storeId;
+
+    @ApiModelProperty("适用店铺ID列表")
+    private List<Integer> storeIdList;
+
+    @ApiModelProperty("具体项目列表")
+    private List<CommissionRuleItemParam> detailList;
+
+    @ApiModelProperty("备注")
+    private String description;
+
+    @ApiModelProperty("最后操作人")
+    private String operator;
+
+    @ApiModelProperty("状态")
+    private String status;
+
+}

fuint-application/src/main/java/com/fuint/common/service/CommissionRuleService.java

@@ -1,6 +1,7 @@
 package com.fuint.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuint.common.param.CommissionRuleParam;
 import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.framework.exception.BusinessCheckException;
@@ -31,7 +32,7 @@ public interface CommissionRuleService extends IService<MtCommissionRule> {
      * @param  commissionRule
      * @throws BusinessCheckException
      */
-    MtCommissionRule addCommissionRule(MtCommissionRule commissionRule) throws BusinessCheckException;
+    MtCommissionRule addCommissionRule(CommissionRuleParam commissionRule) throws BusinessCheckException;
 
     /**
      * 根据ID获取规则信息
@@ -41,25 +42,16 @@ public interface CommissionRuleService extends IService<MtCommissionRule> {
      */
     MtCommissionRule queryCommissionRuleById(Integer id) throws BusinessCheckException;
 
-    /**
-     * 根据ID删除分销提成规则
-     *
-     * @param id       ID
-     * @param operator 操作人
-     * @throws BusinessCheckException
-     */
-    void deleteCommissionRule(Integer id, String operator) throws BusinessCheckException;
-
     /**
      * 更新数据
      * @param  commissionRule
      * @throws BusinessCheckException
      * */
-    MtCommissionRule updateCommissionRule(MtCommissionRule commissionRule) throws BusinessCheckException;
+    MtCommissionRule updateCommissionRule(CommissionRuleParam commissionRule) throws BusinessCheckException;
 
     /**
      * 根据条件搜索分销提成规则
      * */
-    List<MtCommissionRule> queryDataByParams(Map<String, Object> params) throws BusinessCheckException;
+    List<MtCommissionRule> queryCommissionRuleByParams(Map<String, Object> params) throws BusinessCheckException;
 
 }

fuint-application/src/main/java/com/fuint/common/service/impl/CommissionRuleServiceImpl.java

@@ -4,15 +4,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import com.fuint.common.param.CommissionRuleItemParam;
+import com.fuint.common.param.CommissionRuleParam;
 import com.fuint.framework.annoation.OperationServiceLog;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
+import com.fuint.repository.mapper.MtCommissionRuleItemMapper;
 import com.fuint.repository.mapper.MtCommissionRuleMapper;
 import com.fuint.common.service.CommissionRuleService;
 import com.fuint.common.enums.StatusEnum;
 
 import com.fuint.repository.model.MtCommissionRule;
+import com.fuint.repository.model.MtCommissionRuleItem;
+import com.fuint.utils.StringUtil;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -40,6 +45,8 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
 
     private MtCommissionRuleMapper mtCommissionRuleMapper;
 
+    private MtCommissionRuleItemMapper mtCommissionRuleItemMapper;
+
     /**
      * 分页查询规则列表
      *
@@ -52,14 +59,22 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
         LambdaQueryWrapper<MtCommissionRule> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.ne(MtCommissionRule::getStatus, StatusEnum.DISABLE.getKey());
 
-        String title = paginationRequest.getSearchParams().get("title") == null ? "" : paginationRequest.getSearchParams().get("title").toString();
-        if (StringUtils.isNotBlank(title)) {
-            lambdaQueryWrapper.like(MtCommissionRule::getName, title);
+        String name = paginationRequest.getSearchParams().get("name") == null ? "" : paginationRequest.getSearchParams().get("name").toString();
+        if (StringUtils.isNotBlank(name)) {
+            lambdaQueryWrapper.like(MtCommissionRule::getName, name);
         }
         String status = paginationRequest.getSearchParams().get("status") == null ? "" : paginationRequest.getSearchParams().get("status").toString();
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtCommissionRule::getStatus, status);
         }
+        String target = paginationRequest.getSearchParams().get("target") == null ? "" : paginationRequest.getSearchParams().get("target").toString();
+        if (StringUtils.isNotBlank(target)) {
+            lambdaQueryWrapper.eq(MtCommissionRule::getTarget, target);
+        }
+        String type = paginationRequest.getSearchParams().get("type") == null ? "" : paginationRequest.getSearchParams().get("type").toString();
+        if (StringUtils.isNotBlank(type)) {
+            lambdaQueryWrapper.eq(MtCommissionRule::getType, type);
+        }
         String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
         if (StringUtils.isNotBlank(merchantId)) {
             lambdaQueryWrapper.eq(MtCommissionRule::getMerchantId, merchantId);
@@ -86,10 +101,12 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
      * 添加分销提成规则
      *
      * @param commissionRule
+     * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "新增分销提成规则")
-    public MtCommissionRule addCommissionRule(MtCommissionRule commissionRule) throws BusinessCheckException {
+    public MtCommissionRule addCommissionRule(CommissionRuleParam commissionRule) throws BusinessCheckException {
         MtCommissionRule mtCommissionRule = new MtCommissionRule();
         BeanUtils.copyProperties(commissionRule, mtCommissionRule);
         mtCommissionRule.setStatus(StatusEnum.ENABLED.getKey());
@@ -99,11 +116,33 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
         mtCommissionRule.setMerchantId(mtCommissionRule.getMerchantId()== null ? 0 : mtCommissionRule.getMerchantId());
         boolean result = save(mtCommissionRule);
         if (result) {
-            return mtCommissionRule;
+            if (commissionRule.getDetailList() != null && commissionRule.getDetailList().size() > 0) {
+                String storeIds = StringUtil.join(commissionRule.getStoreIdList().toArray(), ",");
+                for (CommissionRuleItemParam itemParam : commissionRule.getDetailList()) {
+                     MtCommissionRuleItem mtCommissionRuleItem = new MtCommissionRuleItem();
+                     mtCommissionRuleItem.setRuleId(mtCommissionRule.getId());
+                     mtCommissionRuleItem.setType(mtCommissionRule.getType());
+                     mtCommissionRuleItem.setTarget(mtCommissionRule.getTarget());
+                     mtCommissionRuleItem.setMerchantId(mtCommissionRule.getMerchantId());
+                     mtCommissionRuleItem.setStoreId(mtCommissionRule.getStoreId());
+                     mtCommissionRuleItem.setStoreIds(storeIds);
+                     mtCommissionRuleItem.setCreateTime(date);
+                     mtCommissionRuleItem.setUpdateTime(date);
+                     mtCommissionRuleItem.setOperator(commissionRule.getOperator());
+                     mtCommissionRuleItem.setStatus(mtCommissionRule.getStatus());
+                     mtCommissionRuleItem.setMethod(itemParam.getMethod());
+                     mtCommissionRuleItem.setTarget(commissionRule.getTarget());
+                     mtCommissionRuleItem.setTargetId(itemParam.getGoodsId());
+                     mtCommissionRuleItem.setMember(itemParam.getMemberVal());
+                     mtCommissionRuleItem.setGuest(itemParam.getVisitorVal());
+                     mtCommissionRuleItemMapper.insert(mtCommissionRuleItem);
+                }
+            }
         } else {
             logger.error("新增分销提成规则失败...");
             throw new BusinessCheckException("新增分销方案规则失败");
         }
+        return mtCommissionRule;
     }
 
     /**
@@ -116,25 +155,6 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
         return mtCommissionRuleMapper.selectById(id);
     }
 
-    /**
-     * 根据ID删除
-     *
-     * @param id
-     * @param operator 操作人
-     */
-    @Override
-    @OperationServiceLog(description = "删除分销提成规则")
-    public void deleteCommissionRule(Integer id, String operator) {
-        MtCommissionRule mtCommissionRule = queryCommissionRuleById(id);
-        if (mtCommissionRule == null) {
-            logger.error("删除分销提成规则失败...");
-            return;
-        }
-        mtCommissionRule.setStatus(StatusEnum.DISABLE.getKey());
-        mtCommissionRule.setUpdateTime(new Date());
-        mtCommissionRuleMapper.updateById(mtCommissionRule);
-    }
-
     /**
      * 更新分销提成规则
      *
@@ -144,7 +164,7 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     @OperationServiceLog(description = "更新分销提成规则")
-    public MtCommissionRule updateCommissionRule(MtCommissionRule commissionRule) throws BusinessCheckException {
+    public MtCommissionRule updateCommissionRule(CommissionRuleParam commissionRule) throws BusinessCheckException {
         MtCommissionRule mtCommissionRule = queryCommissionRuleById(commissionRule.getId());
         if (mtCommissionRule == null) {
             logger.error("更新分销提成规则失败...");
@@ -162,6 +182,9 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
         }
         if (commissionRule.getStatus() != null) {
             mtCommissionRule.setStatus(commissionRule.getStatus());
+            if (commissionRule.getStatus().equals(StatusEnum.DISABLE.getKey())) {
+                mtCommissionRuleItemMapper.deleteByRuleId(commissionRule.getId(), new Date());
+            }
         }
         mtCommissionRule.setUpdateTime(new Date());
         mtCommissionRuleMapper.updateById(mtCommissionRule);
@@ -169,7 +192,7 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
     }
 
     @Override
-    public List<MtCommissionRule> queryDataByParams(Map<String, Object> params) {
+    public List<MtCommissionRule> queryCommissionRuleByParams(Map<String, Object> params) {
         String status =  params.get("status") == null ? StatusEnum.ENABLED.getKey(): params.get("status").toString();
         String storeId =  params.get("storeId") == null ? "" : params.get("storeId").toString();
         String name = params.get("name") == null ? "" : params.get("name").toString();

fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java

@@ -8,10 +8,7 @@ import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.dto.GroupMemberDto;
 import com.fuint.common.dto.MemberTopDto;
 import com.fuint.common.dto.UserDto;
-import com.fuint.common.enums.GenderEnum;
-import com.fuint.common.enums.MemberSourceEnum;
-import com.fuint.common.enums.StatusEnum;
-import com.fuint.common.enums.UserActionEnum;
+import com.fuint.common.enums.*;
 import com.fuint.common.service.*;
 import com.fuint.common.util.*;
 import com.fuint.framework.annoation.OperationServiceLog;
@@ -89,6 +86,11 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
      */
     private UserActionService userActionService;
 
+    /**
+     * 系统配置服务接口
+     * */
+    private SettingService settingService;
+
     /**
      * 更新活跃时间
      * @param userId 会员ID
@@ -611,6 +613,25 @@ public class MemberServiceImpl extends ServiceImpl<MtUserMapper, MtUser> impleme
         String mobile = StringUtil.isNotEmpty(userInfo.getString("phone")) ? userInfo.getString("phone") : "";
         String source = StringUtil.isNotEmpty(userInfo.getString("source")) ? userInfo.getString("source") : MemberSourceEnum.WECHAT_LOGIN.getKey();
 
+        // 需要手机号登录
+        if (StringUtil.isEmpty(mobile) && user == null) {
+            MtSetting mtSetting = settingService.querySettingByName(merchantId, UserSettingEnum.LOGIN_NEED_PHONE.getKey());
+            if (mtSetting != null) {
+                if (mtSetting.getValue().equals("true")) {
+                    MtUser tempUser = new MtUser();
+                    tempUser.setOpenId(openId);
+                    tempUser.setId(0);
+                    return tempUser;
+                }
+            }
+        }
+
+        // 手机号已经存在
+        if (StringUtil.isNotEmpty(mobile) && user == null) {
+            user = queryMemberByMobile(merchantId, mobile);
+            user.setOpenId(openId);
+        }
+
         if (user == null) {
             MtUser mtUser = new MtUser();
             if (StringUtil.isNotEmpty(mobile)) {

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionLogController.java

@@ -1,6 +1,7 @@
 package com.fuint.module.backendApi.controller;
 
 import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.param.CommissionRuleParam;
 import com.fuint.common.service.CommissionRuleService;
 import com.fuint.common.service.StoreService;
 import com.fuint.common.util.TokenUtil;
@@ -132,7 +133,7 @@ public class BackendCommissionLogController extends BaseController {
 
         String operator = accountInfo.getAccountName();
 
-        MtCommissionRule commissionRule = new MtCommissionRule();
+        CommissionRuleParam commissionRule = new CommissionRuleParam();
         commissionRule.setOperator(operator);
         commissionRule.setId(id);
         commissionRule.setStatus(status);
@@ -150,13 +151,12 @@ public class BackendCommissionLogController extends BaseController {
     @ApiOperation(value = "保存分销提成规则")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject saveHandler(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
+    public ResponseObject saveHandler(HttpServletRequest request, @RequestBody CommissionRuleParam params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
-        String id = params.get("id") == null ? "" : params.get("id").toString();
-        String name = params.get("name") == null ? "" : params.get("name").toString();
-        String description = params.get("description") == null ? "" : params.get("description").toString();
-        String status = params.get("status") == null ? "" : params.get("status").toString();
-        String storeId = params.get("storeId") == null ? "0" : params.get("storeId").toString();
+        String id = params.getId() == null ? "" : params.getId().toString();
+        String name = params.getName() == null ? "" : params.getName();
+        String description = params.getDescription() == null ? "" : params.getDescription();
+        String status = params.getStatus() == null ? "" : params.getStatus();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo == null) {
@@ -168,12 +168,11 @@ public class BackendCommissionLogController extends BaseController {
         info.setDescription(description);
         info.setOperator(accountInfo.getAccountName());
         info.setStatus(status);
-        info.setStoreId(Integer.parseInt(storeId));
         if (StringUtil.isNotEmpty(id)) {
             info.setId(Integer.parseInt(id));
-            commissionRuleService.updateCommissionRule(info);
+            commissionRuleService.updateCommissionRule(params);
         } else {
-            commissionRuleService.addCommissionRule(info);
+            commissionRuleService.addCommissionRule(params);
         }
         return getSuccessResult(true);
     }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendCommissionRuleController.java

@@ -1,6 +1,7 @@
 package com.fuint.module.backendApi.controller;
 
 import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.param.CommissionRuleParam;
 import com.fuint.common.service.CommissionRuleService;
 import com.fuint.common.service.StoreService;
 import com.fuint.common.util.TokenUtil;
@@ -58,9 +59,10 @@ public class BackendCommissionRuleController extends BaseController {
         String token = request.getHeader("Access-Token");
         Integer page = request.getParameter("page") == null ? Constants.PAGE_NUMBER : Integer.parseInt(request.getParameter("page"));
         Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
-        String title = request.getParameter("title");
+        String name = request.getParameter("name");
         String status = request.getParameter("status");
-        String searchStoreId = request.getParameter("storeId");
+        String target = request.getParameter("target");
+        String type = request.getParameter("type");
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         Integer storeId;
@@ -75,8 +77,14 @@ public class BackendCommissionRuleController extends BaseController {
         paginationRequest.setPageSize(pageSize);
 
         Map<String, Object> params = new HashMap<>();
-        if (StringUtil.isNotEmpty(title)) {
-            params.put("title", title);
+        if (StringUtil.isNotEmpty(name)) {
+            params.put("name", name);
+        }
+        if (StringUtil.isNotEmpty(target)) {
+            params.put("target", target);
+        }
+        if (StringUtil.isNotEmpty(type)) {
+            params.put("type", type);
         }
         if (StringUtil.isNotEmpty(status)) {
             params.put("status", status);
@@ -84,9 +92,6 @@ public class BackendCommissionRuleController extends BaseController {
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
             params.put("merchantId", accountInfo.getMerchantId());
         }
-        if (StringUtil.isNotEmpty(searchStoreId)) {
-            params.put("storeId", searchStoreId);
-        }
         if (storeId != null && storeId > 0) {
             params.put("storeId", storeId);
         }
@@ -135,7 +140,7 @@ public class BackendCommissionRuleController extends BaseController {
 
         String operator = accountInfo.getAccountName();
 
-        MtCommissionRule commissionRule = new MtCommissionRule();
+        CommissionRuleParam commissionRule = new CommissionRuleParam();
         commissionRule.setOperator(operator);
         commissionRule.setId(id);
         commissionRule.setStatus(status);
@@ -153,33 +158,24 @@ public class BackendCommissionRuleController extends BaseController {
     @ApiOperation(value = "保存分销提成规则")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject saveHandler(HttpServletRequest request, @RequestBody Map<String, Object> params) throws BusinessCheckException {
+    public ResponseObject saveHandler(HttpServletRequest request, @RequestBody CommissionRuleParam params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
-        String id = params.get("id") == null ? "" : params.get("id").toString();
-        String name = params.get("name") == null ? "" : params.get("name").toString();
-        String description = params.get("description") == null ? "" : params.get("description").toString();
-        String status = params.get("status") == null ? "" : params.get("status").toString();
-        String storeId = params.get("storeId") == null ? "0" : params.get("storeId").toString();
+        String id = params.getId() == null ? "" : params.getId().toString();
 
         AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
         if (accountInfo == null) {
             return getFailureResult(1001, "请先登录");
         }
-
-        MtCommissionRule info = new MtCommissionRule();
-        info.setName(name);
-        info.setDescription(description);
-        info.setOperator(accountInfo.getAccountName());
-        info.setStatus(status);
         if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
-            info.setMerchantId(accountInfo.getMerchantId());
+            params.setMerchantId(accountInfo.getMerchantId());
+        }
+        if (accountInfo.getStoreId() != null && accountInfo.getStoreId() > 0) {
+            params.setStoreId(accountInfo.getStoreId());
         }
-        info.setStoreId(Integer.parseInt(storeId));
         if (StringUtil.isNotEmpty(id)) {
-            info.setId(Integer.parseInt(id));
-            commissionRuleService.updateCommissionRule(info);
+            commissionRuleService.updateCommissionRule(params);
         } else {
-            commissionRuleService.addCommissionRule(info);
+            commissionRuleService.addCommissionRule(params);
         }
         return getSuccessResult(true);
     }

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java

@@ -192,22 +192,22 @@ public class ClientSignController extends BaseController {
         String userAgent = request.getHeader("user-agent") == null ? "" : request.getHeader("user-agent");
 
         if (StringUtil.isEmpty(account)) {
-            return getFailureResult(1002,"用户名不能为空");
+            return getFailureResult(201,"用户名不能为空");
         }
         if (StringUtil.isEmpty(password)) {
-            return getFailureResult(1002,"密码不能为空");
+            return getFailureResult(201,"密码不能为空");
         }
         if (StringUtil.isEmpty(captchaCode)) {
-            return getFailureResult(1002,"图形验证码不能为空");
+            return getFailureResult(201,"图形验证码不能为空");
         }
         boolean captchaVerify = captchaService.checkCodeByUuid(captchaCode, uuid);
         if (!captchaVerify) {
-            return getFailureResult(1002,"图形验证码有误");
+            return getFailureResult(201,"图形验证码有误");
         }
         Integer merchantId = merchantService.getMerchantId(merchantNo);
         MtUser userData = memberService.queryMemberByName(merchantId, account);
         if (userData != null) {
-            return getFailureResult(1002,"该用户名已存在");
+            return getFailureResult(201,"该用户名已存在");
         }
 
         MtUser mtUser = new MtUser();
@@ -292,7 +292,7 @@ public class ClientSignController extends BaseController {
                 }
 
                 if (!mtUser.getStatus().equals(StatusEnum.ENABLED.getKey())) {
-                    return getFailureResult(1002, "账号异常，登录失败");
+                    return getFailureResult(201, "账号异常，登录失败");
                 }
 
                 // 更新验证码
@@ -308,7 +308,7 @@ public class ClientSignController extends BaseController {
                 dto.setTokenCreatedTime(System.currentTimeMillis());
             } else {
                 dto.setIsLogin("false");
-                return getFailureResult(1002, "验证码错误或已过期，登录失败");
+                return getFailureResult(201, "验证码错误或已过期，登录失败");
             }
         }
 
@@ -316,7 +316,7 @@ public class ClientSignController extends BaseController {
         if (StringUtil.isNotEmpty(account) && StringUtil.isNotEmpty(password) && StringUtil.isNotEmpty(captchaCode)) {
             Boolean captchaVerify = captchaService.checkCodeByUuid(captchaCode, uuid);
             if (!captchaVerify) {
-                return getFailureResult(1002,"图形验证码有误");
+                return getFailureResult(201,"图形验证码有误");
             }
 
             MtUser userInfo = memberService.queryMemberByName(merchantId, account);

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSmsController.java

@@ -67,7 +67,7 @@ public class ClientSmsController extends BaseController {
         String captchaCode = param.get("captchaCode") == null ? "" : param.get("captchaCode").toString();
         String uuid = param.get("uuid") == null ? "" : param.get("uuid").toString();
         if (StringUtil.isEmpty(captchaCode)) {
-            return getFailureResult(1002,"图形验证码不能为空");
+            return getFailureResult(201,"图形验证码不能为空");
         }
 
         HttpSession session = request.getSession();
@@ -78,7 +78,7 @@ public class ClientSmsController extends BaseController {
             captchaVerify = captchaService.checkCode(captchaCode, session);
         }
         if (!captchaVerify) {
-            return getFailureResult(1002,"图形验证码有误");
+            return getFailureResult(201,"图形验证码有误");
         }
 
         // 验证码时间间隔
@@ -88,10 +88,10 @@ public class ClientSmsController extends BaseController {
         }
 
         if (StringUtil.isEmpty(mobile)) {
-            return getFailureResult(1002,"手机号码不能为空");
+            return getFailureResult(201,"手机号码不能为空");
         } else {
             if (!PhoneFormatCheckUtils.isChinaPhoneLegal(mobile)) {
-                return getFailureResult(1002,"手机号码格式不正确");
+                return getFailureResult(201,"手机号码格式不正确");
             }
         }
 
@@ -99,9 +99,9 @@ public class ClientSmsController extends BaseController {
         String verifyCode= BizCodeGenerator.getVerifyCode();
         MtVerifyCode mtVerifyCode = verifyCodeService.addVerifyCode(mobile, verifyCode,60);
         if (null == mtVerifyCode) {
-            return getFailureResult(1002,"验证码发送失败");
+            return getFailureResult(201,"验证码发送失败");
         } else if(mtVerifyCode.getVerifyCode().equals("1") && mtVerifyCode.getId() == null){
-            return getFailureResult(1002,"验证码发送间隔太短,请稍后再试！");
+            return getFailureResult(201,"验证码发送间隔太短,请稍后再试！");
         }
 
         // 发送短信

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientUserController.java

@@ -211,12 +211,12 @@ public class ClientUserController extends BaseController {
         List<MtSetting> settingList = settingService.getSettingList(merchantId, SettingTypeEnum.USER.getKey());
 
         for (MtSetting setting : settingList) {
-            if (setting.getName().equals("getCouponNeedPhone")) {
-                outParams.put("getCouponNeedPhone", setting.getValue());
-            } else if (setting.getName().equals("submitOrderNeedPhone")) {
-                outParams.put("submitOrderNeedPhone", setting.getValue());
-            } else if (setting.getName().equals("loginNeedPhone")) {
-                outParams.put("loginNeedPhone", setting.getValue());
+            if (setting.getName().equals(UserSettingEnum.GET_COUPON_NEED_PHONE.getKey())) {
+                outParams.put(UserSettingEnum.GET_COUPON_NEED_PHONE.getKey(), setting.getValue());
+            } else if (setting.getName().equals(UserSettingEnum.SUBMIT_ORDER_NEED_PHONE.getKey())) {
+                outParams.put(UserSettingEnum.SUBMIT_ORDER_NEED_PHONE.getKey(), setting.getValue());
+            } else if (setting.getName().equals(UserSettingEnum.LOGIN_NEED_PHONE.getKey())) {
+                outParams.put(UserSettingEnum.LOGIN_NEED_PHONE.getKey(), setting.getValue());
             }
         }
 

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientUserCouponController.java

@@ -120,7 +120,7 @@ public class ClientUserCouponController extends BaseController {
 
         MtCoupon couponInfo = couponService.queryCouponById(userCoupon.getCouponId());
         if (null == couponInfo) {
-            return getFailureResult(1002);
+            return getFailureResult(201);
         }
 
         ByteArrayOutputStream out = null;

fuint-application/src/main/java/com/fuint/module/merchantApi/controller/MerchantMemberController.java

@@ -97,7 +97,7 @@ public class MerchantMemberController extends BaseController {
             staffInfo = staffService.queryStaffByMobile(mtUser.getMobile());
         }
         if (staffInfo == null) {
-            return getFailureResult(1002, "该账号不是商户");
+            return getFailureResult(201, "该账号不是商户");
         }
 
         PaginationRequest paginationRequest = new PaginationRequest();

fuint-repository/src/main/java/com/fuint/repository/mapper/MtCommissionRuleItemMapper.java

@@ -2,6 +2,8 @@ package com.fuint.repository.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fuint.repository.model.MtCommissionRuleItem;
+import org.apache.ibatis.annotations.Param;
+import java.util.Date;
 
 /**
  *  分佣提成规则项目 Mapper 接口
@@ -10,5 +12,5 @@ import com.fuint.repository.model.MtCommissionRuleItem;
  * CopyRight https://www.fuint.cn
  */
 public interface MtCommissionRuleItemMapper extends BaseMapper<MtCommissionRuleItem> {
-   // empty
+    Boolean deleteByRuleId(@Param("ruleId") Integer ruleId, @Param("updateTime") Date updateTime);
 }

fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionLog.java

@@ -29,7 +29,7 @@ public class MtCommissionLog implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty("分佣类型,distribution:会员分销；staff：员工提成")
+    @ApiModelProperty("分佣类型,member:会员分销；staff：员工提成")
     private String type;
 
     @ApiModelProperty("分佣等级")
@@ -53,7 +53,7 @@ public class MtCommissionLog implements Serializable {
     @ApiModelProperty("分佣金额")
     private BigDecimal amount;
 
-    @ApiModelProperty("分佣规则ID")
+    @ApiModelProperty("规则ID")
     private Integer ruleId;
 
     @ApiModelProperty("备注")

fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionRule.java

@@ -31,16 +31,16 @@ public class MtCommissionRule implements Serializable {
     @ApiModelProperty("规则名称")
     private String name;
 
-    @ApiModelProperty("分佣类型,distribution:会员分销；staff：员工提成")
+    @ApiModelProperty("方案类型,goods:商品销售；coupon：卡券销售；recharge：会员充值")
     private String type;
 
-    @ApiModelProperty("分佣对象")
+    @ApiModelProperty("分佣对象,member:会员分销；staff：员工提成")
     private String target;
 
     @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    @ApiModelProperty("适用店铺ID")
+    @ApiModelProperty("店铺ID")
     private Integer storeId;
 
     @ApiModelProperty("创建时间")

fuint-repository/src/main/java/com/fuint/repository/model/MtCommissionRuleItem.java

@@ -29,17 +29,20 @@ public class MtCommissionRuleItem implements Serializable {
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
-    @ApiModelProperty("分佣类型,distribution:会员分销；staff：员工提成")
+    @ApiModelProperty("方案类型,goods:商品销售；coupon：卡券销售；recharge：会员充值")
     private String type;
 
+    @ApiModelProperty("分佣对象,member:会员分销；staff：员工提成")
+    private String target;
+
     @ApiModelProperty("规则ID")
     private Integer ruleId;
 
-    @ApiModelProperty("适用店铺ID")
-    private Integer storeId;
+    @ApiModelProperty("商户ID")
+    private Integer merchantId;
 
-    @ApiModelProperty("分佣对象")
-    private String target;
+    @ApiModelProperty("店铺ID")
+    private Integer storeId;
 
     @ApiModelProperty("分佣对象ID")
     private Integer targetId;
@@ -47,6 +50,9 @@ public class MtCommissionRuleItem implements Serializable {
     @ApiModelProperty("提成方式（按比例/固定金额）")
     private String method;
 
+    @ApiModelProperty("适用店铺ID,逗号隔开")
+    private String storeIds;
+
     @ApiModelProperty("散客佣金")
     private BigDecimal guest;
 

fuint-repository/src/main/resources/mapper/MtCommissionCashMapper.xml

@@ -0,0 +1,5 @@
+<?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.fuint.repository.mapper.MtCommissionCashMapper">
+
+</mapper>

fuint-repository/src/main/resources/mapper/MtCommissionLogMapper.xml

@@ -0,0 +1,4 @@
+<?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.fuint.repository.mapper.MtCommissionLogMapper">
+</mapper>

fuint-repository/src/main/resources/mapper/MtCommissionRelationMapper.xml

@@ -0,0 +1,5 @@
+<?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.fuint.repository.mapper.MtCommissionRelationMapper">
+
+</mapper>

fuint-repository/src/main/resources/mapper/MtCommissionRuleItemMapper.xml

@@ -0,0 +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.fuint.repository.mapper.MtCommissionRuleItemMapper">
+    <update id="deleteByRuleId">
+        update mt_commission_rule_item set STATUS = 'D',UPDATE_TIME=#{updateTime} where RULE_ID = #{ruleId}
+    </update>
+</mapper>

fuint-repository/src/main/resources/mapper/MtCommissionRuleMapper.xml

@@ -0,0 +1,4 @@
+<?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.fuint.repository.mapper.MtCommissionRuleMapper">
+</mapper>