首次提交

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/consumptiontopuplog/vo/TopUpRespVO.java → feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/controller/admin/integraltopuplog/vo/TopUpRespVO.java

@@ -1,4 +1,4 @@
-package cn.newfeifan.mall.module.distri.controller.admin.consumptiontopuplog.vo;
+package cn.newfeifan.mall.module.distri.controller.admin.integraltopuplog.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -17,5 +17,5 @@ public class TopUpRespVO {
     private LocalDate date;
 
     @Schema(description = "数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long consumptionPoints;
+    private Long integralPoints;
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/service/spuapply/SpuApplyServiceImpl.java

@@ -121,7 +121,7 @@ public class SpuApplyServiceImpl implements SpuApplyService {
             smsCodeSendReqDTO.setScene(SmsSceneEnum.SPU_APPLY_ERROR.getScene());
         }
         // 发送短信
-        smsCodeApi.sendSmsCode(smsCodeSendReqDTO);
+//        smsCodeApi.sendSmsCode(smsCodeSendReqDTO);
     }
 
     @Override
@@ -141,11 +141,6 @@ public class SpuApplyServiceImpl implements SpuApplyService {
         }
     }
 
-    @Override
-    public SpuApplyDO getSpuApply(Long id) {
-        return spuApplyMapper.selectById(id);
-    }
-
     @Override
     public PageResult<SpuApplyDO> getSpuApplyPage(SpuApplyPageReqVO pageReqVO) {
         return spuApplyMapper.selectPage(pageReqVO);

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/handler/TradeBargainOrderHandler.java

@@ -33,9 +33,6 @@ public class TradeBargainOrderHandler implements TradeOrderHandler {
         // 明确校验一下
         Assert.isTrue(orderItems.size() == 1, "砍价时，只允许选择一个商品");
 
-        // 扣减砍价活动的库存
-        bargainActivityApi.updateBargainActivityStock(order.getBargainActivityId(),
-                -orderItems.get(0).getCount());
     }
 
     @Override
@@ -46,10 +43,7 @@ public class TradeBargainOrderHandler implements TradeOrderHandler {
         // 明确校验一下
         Assert.isTrue(orderItems.size() == 1, "砍价时，只允许选择一个商品");
 
-        // 记录砍价记录对应的订单编号
-        bargainRecordApi.updateBargainRecordOrderId(order.getBargainRecordId(), order.getId());
     }
-
     @Override
     public void afterCancelOrder(TradeOrderDO order, List<TradeOrderItemDO> orderItems) {
         if (!TradeOrderTypeEnum.isBargain(order.getType())) {
@@ -71,8 +65,6 @@ public class TradeBargainOrderHandler implements TradeOrderHandler {
         if (!TradeOrderTypeEnum.isBargain(order.getType())) {
             return;
         }
-        // 恢复（增加）砍价活动的库存
-        bargainActivityApi.updateBargainActivityStock(order.getBargainActivityId(), orderItem.getCount());
     }
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/handler/TradeCombinationOrderHandler.java

@@ -43,17 +43,6 @@ public class TradeCombinationOrderHandler implements TradeOrderHandler {
         }
         Assert.isTrue(orderItems.size() == 1, "拼团时，只允许选择一个商品");
 
-        // 1. 校验是否满足拼团活动相关限制
-        TradeOrderItemDO item = orderItems.get(0);
-        combinationRecordApi.validateCombinationRecord(order.getUserId(), order.getCombinationActivityId(),
-                order.getCombinationHeadId(), item.getSkuId(), item.getCount());
-
-        // 2. 校验该用户是否存在未支付的拼团活动订单，避免一个拼团可以下多个单子了
-        TradeOrderDO activityOrder = orderQueryService.getOrderByUserIdAndStatusAndCombination(
-                order.getUserId(), order.getCombinationActivityId(), TradeOrderStatusEnum.UNPAID.getStatus());
-        if (activityOrder != null) {
-            throw exception(ORDER_CREATE_FAIL_EXIST_UNPAID);
-        }
     }
 
     @Override
@@ -71,7 +60,7 @@ public class TradeCombinationOrderHandler implements TradeOrderHandler {
 
         // 3. 更新拼团相关信息到订单。为什么几个字段都要更新？
         // 原因是：如果创建订单时自己是团长的情况下 combinationHeadId 是为 null 的，设置团长编号这个操作时在订单是否后创建拼团记录时才设置的。
-        orderUpdateService.updateOrderCombinationInfo(order.getId(), order.getCombinationActivityId(),
+        orderUpdateService.updateOrderCombinationInfo(order.getId(), null,
                 combinationRecord.getCombinationRecordId(), combinationRecord.getCombinationHeadId());
     }