首次提交

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/ordercalc/vo/OrderCalcRespVO.java

@@ -60,16 +60,13 @@ public class OrderCalcRespVO {
     @Schema(description = "计算百分比模板")
     private String percentTemplate;
 
-    @Schema(description = "用户昵称", example = "王五")
-    @ExcelProperty("用户昵称")
-    private String nickName;
     @Schema(description = "订单ID", example = "21497")
     @ExcelProperty("订单ID")
     private Long orderId;
 
-    @Schema(description = "下单人姓名", example = "赵六")
-    @ExcelProperty("下单人姓名")
-    private String name;
+    @Schema(description = "下单人用户名", example = "赵六")
+    @ExcelProperty("下单人用户名")
+    private String userName;
 
 
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/partitionbrothers/vo/PartitionBrothersRespVO.java

@@ -41,12 +41,9 @@ public class PartitionBrothersRespVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
-    @Schema(description = "用户名称", example = "张三")
-    @ExcelProperty("用户名称")
-    private String name;
 
     @Schema(description = "用户昵称", example = "赵六")
     @ExcelProperty("用户昵称")
-    private String nickName;
+    private String userName;
 
 }

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/dal/mysql/partitionbrothers/PartitionBrothersMapper.java

@@ -26,8 +26,7 @@ public interface PartitionBrothersMapper extends BaseMapperX<PartitionBrothersDO
                 .eqIfPresent(PartitionBrothersDO::getAfterHitQuota, reqVO.getAfterHitQuota())
                 .eqIfPresent(PartitionBrothersDO::getSize, reqVO.getSize())
                 .betweenIfPresent(PartitionBrothersDO::getCreateTime, reqVO.getCreateTime())
-                .likeIfPresent(PartitionBrothersDO::getName, reqVO.getName())
-                .likeIfPresent(PartitionBrothersDO::getNickName, reqVO.getNickName())
+                .likeIfPresent(PartitionBrothersDO::getUserName, reqVO.getUserName())
                 .orderByDesc(PartitionBrothersDO::getId));
     }
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/mq/message/order/OrderItemMessage.java

@@ -38,11 +38,6 @@ public class OrderItemMessage {
      */
     private Long orderId;
 
-    /**
-     * 用户自得积分
-     */
-    private Long increaseIntegral;
-
     /**
      * 推荐用户获得积分
      */

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/orderpercentage/OrderPercentageServiceImpl.java

@@ -42,16 +42,6 @@ public class OrderPercentageServiceImpl implements OrderPercentageService {
 
     @Override
     public Long createOrderPercentage(OrderPercentageSaveReqVO createReqVO) {
-       /* OrderPercentageSaveReqVO orderPercentageSaveReqVO = new OrderPercentageSaveReqVO();
-        orderPercentageSaveReqVO.setDivideIntoPerc((int) (createReqVO.getDivideIntoPerc() * PERCENT));
-        orderPercentageSaveReqVO.setGrossProfitPerc((int) (createReqVO.getGrossProfitPerc() * PERCENT));
-        orderPercentageSaveReqVO.setGrossProfitAncestorQuotaPerc((int) (createReqVO.getGrossProfitAncestorQuotaPerc() * PERCENT));
-        orderPercentageSaveReqVO.setGrossProfitBonusQuotaPerc((int) (createReqVO.getGrossProfitBonusQuotaPerc() * PERCENT));
-        orderPercentageSaveReqVO.setGrossProfitPlatformQuotaPerc((int) (createReqVO.getGrossProfitPlatformQuotaPerc() * PERCENT));
-        orderPercentageSaveReqVO.setGrossProfitUserQuotaPerc((int) (createReqVO.getGrossProfitUserQuotaPerc() * PERCENT));
-        if (checkPercent(createReqVO)){
-            throw  exception(PERCENT_LARGE_ONE_HUNDRED);
-        }*/
         // 插入
         OrderPercentageDO orderPercentage = BeanUtils.toBean(createReqVO, OrderPercentageDO.class);
         orderPercentageMapper.insert(orderPercentage);
@@ -59,22 +49,14 @@ public class OrderPercentageServiceImpl implements OrderPercentageService {
         return orderPercentage.getId();
     }
 
-  /*  public boolean checkPercent(OrderPercentageDoubleSaveReqVO createReqVO){
-        // 判断是否等于1
-        Double total =  createReqVO.getGrossProfitUserQuotaPerc()+createReqVO.getGrossProfitAncestorQuotaPerc()+createReqVO.getGrossProfitPlatformQuotaPerc()
-                +createReqVO.getGrossProfitBonusQuotaPerc();
-        return total > ONE_HUNDRED;
-    }*/
-
-
     @Override
     public void updateOrderPercentage(OrderPercentageSaveReqVO updateReqVO) {
         // 校验存在
         validateOrderPercentageExists(updateReqVO.getId());
 
         // 提现百分比校验
-        if(Double.parseDouble(updateReqVO.getWithdrawConsumption()) + Double.parseDouble(updateReqVO.getWithdrawCommission()) != 1.0){
-            ErrorCode ERROR = new ErrorCode(1_002_030_005, "公众提现的总和设置百分比必须等于100%");
+        if(Double.parseDouble(updateReqVO.getBonusYellowIntegral()) + Double.parseDouble(updateReqVO.getBonusGreenIntegral()) != 1.0){
+            ErrorCode ERROR = new ErrorCode(1_002_030_005, "奖金获取的黄绿积分的总和设置百分比必须等于100%");
             throw exception(ERROR);
         }
 

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/mysql/spu/ProductSpuMapper.java

@@ -37,6 +37,7 @@ public interface ProductSpuMapper extends BaseMapperX<ProductSpuDO> {
                 .likeIfPresent(ProductSpuDO::getName, reqVO.getName())
                 .eqIfPresent(ProductSpuDO::getShopId, reqVO.getShopId())
                 .eqIfPresent(ProductSpuDO::getCategoryId, reqVO.getCategoryId())
+                .eqIfPresent(ProductSpuDO::getAreaId, reqVO.getAreaId())
                 .eqIfPresent(ProductSpuDO::getMerchantId, reqVO.getMerchantId())
                 .inIfPresent(ProductSpuDO::getShopId, reqVO.getShopIds())
                 .betweenIfPresent(ProductSpuDO::getCreateTime, reqVO.getCreateTime())