分销提成功能迭代

fuint-application/src/main/java/com/fuint/common/enums/CommissionTargetEnum.java

@@ -7,9 +7,8 @@ package com.fuint.common.enums;
  * CopyRight https://www.fuint.cn
  */
 public enum CommissionTargetEnum {
-    GOODS("goods", "商品销售"),
-    COUPON("coupon", "卡券销售"),
-    RECHARGE("recharge", "会员充值");
+    MEMBER("member", "会员分销"),
+    STAFF("staff", "员工提成");
 
     private String key;
 

fuint-application/src/main/java/com/fuint/common/enums/CommissionTypeEnum.java

@@ -7,8 +7,9 @@ package com.fuint.common.enums;
  * CopyRight https://www.fuint.cn
  */
 public enum CommissionTypeEnum {
-    MEMBER("member", "会员分销"),
-    STAFF("staff", "员工提成");
+    GOODS("goods", "商品销售"),
+    COUPON("coupon", "卡券销售"),
+    RECHARGE("recharge", "会员充值");
 
     private String key;
 

fuint-application/src/main/java/com/fuint/common/enums/GoodsTypeEnum.java

@@ -7,7 +7,7 @@ package com.fuint.common.enums;
  * CopyRight https://www.fuint.cn
  */
 public enum GoodsTypeEnum {
-    PRODUCT("product", "实物商品"),
+    GOODS("goods", "实物商品"),
     SERVICE("service", "服务项目"),
     COUPON("coupon", "虚拟卡券");
 

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

@@ -19,6 +19,7 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.github.pagehelper.Page;
+import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
@@ -59,6 +60,10 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtCommissionRule::getStatus, status);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtCommissionRule::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtCommissionRule::getStoreId, storeId);
@@ -84,14 +89,20 @@ public class CommissionRuleServiceImpl extends ServiceImpl<MtCommissionRuleMappe
      */
     @Override
     @OperationServiceLog(description = "新增分销提成规则")
-    public MtCommissionRule addCommissionRule(MtCommissionRule commissionRule) {
+    public MtCommissionRule addCommissionRule(MtCommissionRule commissionRule) throws BusinessCheckException {
         MtCommissionRule mtCommissionRule = new MtCommissionRule();
-        Integer id = mtCommissionRuleMapper.insert(mtCommissionRule);
-        if (id > 0) {
+        BeanUtils.copyProperties(commissionRule, mtCommissionRule);
+        mtCommissionRule.setStatus(StatusEnum.ENABLED.getKey());
+        Date date = new Date();
+        mtCommissionRule.setCreateTime(date);
+        mtCommissionRule.setUpdateTime(date);
+        mtCommissionRule.setMerchantId(mtCommissionRule.getMerchantId()== null ? 0 : mtCommissionRule.getMerchantId());
+        boolean result = save(mtCommissionRule);
+        if (result) {
             return mtCommissionRule;
         } else {
             logger.error("新增分销提成规则失败...");
-            return null;
+            throw new BusinessCheckException("新增分销方案规则失败");
         }
     }
 

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

@@ -136,6 +136,7 @@ public class GoodsServiceImpl extends ServiceImpl<MtGoodsMapper, MtGoods> implem
             item.setGoodsNo(mtGoods.getGoodsNo());
             item.setCateId(mtGoods.getCateId());
             item.setCateInfo(cateInfo);
+            item.setType(mtGoods.getType());
             item.setPrice(mtGoods.getPrice());
             item.setLinePrice(mtGoods.getLinePrice());
             item.setSalePoint(mtGoods.getSalePoint());

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

@@ -81,6 +81,9 @@ public class BackendCommissionRuleController extends BaseController {
         if (StringUtil.isNotEmpty(status)) {
             params.put("status", status);
         }
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            params.put("merchantId", accountInfo.getMerchantId());
+        }
         if (StringUtil.isNotEmpty(searchStoreId)) {
             params.put("storeId", searchStoreId);
         }
@@ -101,7 +104,7 @@ public class BackendCommissionRuleController extends BaseController {
         List<MtStore> storeList = storeService.queryStoresByParams(paramsStore);
 
         Map<String, Object> result = new HashMap<>();
-        result.put("dataList", paginationResponse);
+        result.put("paginationResponse", paginationResponse);
         result.put("storeList", storeList);
 
         return getSuccessResult(result);
@@ -168,6 +171,9 @@ public class BackendCommissionRuleController extends BaseController {
         info.setDescription(description);
         info.setOperator(accountInfo.getAccountName());
         info.setStatus(status);
+        if (accountInfo.getMerchantId() != null && accountInfo.getMerchantId() > 0) {
+            info.setMerchantId(accountInfo.getMerchantId());
+        }
         info.setStoreId(Integer.parseInt(storeId));
         if (StringUtil.isNotEmpty(id)) {
             info.setId(Integer.parseInt(id));

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

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fuint.repository.model.MtCommissionRule;
 
 /**
- *  佣金规则 Mapper 接口
+ *  方案规则 Mapper 接口
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn