update: 把4月3日修改订单预览、提交的分支内容，通过重新覆盖代码，重新提交。

feifan-module-distri/feifan-module-distri-biz/pom.xml

@@ -56,11 +56,7 @@
             <version>${revision}</version>
         </dependency>
 
-        <dependency>
-            <groupId>cn.newfeifan.zx</groupId>
-            <artifactId>feifan-module-trade-biz</artifactId>
-            <version>${revision}</version>
-        </dependency>
+
 
         <!-- 业务组件 -->
         <dependency>

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

@@ -1,18 +1,5 @@
 package cn.newfeifan.mall.module.distri.service.orderpercentage.handle;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.newfeifan.mall.module.promotion.api.bargain.BargainActivityApi;
-import cn.newfeifan.mall.module.promotion.api.bargain.BargainRecordApi;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
-import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
-import cn.newfeifan.mall.module.trade.enums.order.TradeOrderTypeEnum;
-import cn.newfeifan.mall.module.trade.service.order.handler.TradeOrderHandler;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-
 /**
  * 订单百分比
  *

feifan-module-mall/feifan-module-trade-biz/pom.xml

@@ -130,6 +130,13 @@
             <version>2.0.0-jdk8-snapshot</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.newfeifan.zx</groupId>
+            <artifactId>feifan-module-distri-biz</artifactId>
+            <version>2.0.0-jdk8-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
+
 
     </dependencies>
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java

@@ -24,10 +24,8 @@ public class AppTradeOrderSettlementRespVO {
     @Schema(description = "为键值对：商品对应的店铺id和店名，key为店铺id，value为店铺名", requiredMode = Schema.RequiredMode.REQUIRED, example = "{15:'中星直营店',23:'五行茶旗舰店'}") //key为店铺ID，value为skuid的List
     Map<Long,String> shopNameMap;
 
-    /**
-     * 当前积分值
-     */
-    private Long currentMemberPoints;
+    @Schema(description = "用户当前积分值", requiredMode = Schema.RequiredMode.REQUIRED, example = "98760000")
+    private Integer currentQuota;
 
     @Schema(description = "交易类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") // 对应 TradeOrderTypeEnum 枚举
     private Integer type;

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

@@ -11,10 +11,10 @@ import cn.newfeifan.mall.framework.common.core.KeyValue;
 import cn.newfeifan.mall.framework.common.enums.UserTypeEnum;
 import cn.newfeifan.mall.framework.common.util.json.JsonUtils;
 import cn.newfeifan.mall.framework.common.util.number.MoneyUtils;
+import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
+import cn.newfeifan.mall.module.distri.dal.mysql.integral.IntegralMapper;
 import cn.newfeifan.mall.module.member.api.address.MemberAddressApi;
 import cn.newfeifan.mall.module.member.api.address.dto.MemberAddressRespDTO;
-import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
-import cn.newfeifan.mall.module.member.dal.mysql.user.MemberUserMapper;
 import cn.newfeifan.mall.module.pay.api.order.PayOrderApi;
 import cn.newfeifan.mall.module.pay.api.order.dto.PayOrderCreateReqDTO;
 import cn.newfeifan.mall.module.pay.api.order.dto.PayOrderRespDTO;
@@ -84,7 +84,7 @@ import static cn.newfeifan.mall.module.trade.enums.ErrorCodeConstants.*;
 public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
 
     @Resource
-    private MemberUserMapper memberUserMapper;//add by ben 20240314
+    private IntegralMapper integralMapper;//add by ben 20240411
 
     @Resource
     private ProductSkuMapper productSkuMapper;//add by ben 20240314
@@ -221,17 +221,19 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         }
 
         //********这句是要被注释掉的
-        TradePriceCalculateRespBO calculateRespBO = calculatePrice(userId, settlementReqVO);
+//        TradePriceCalculateRespBO calculateRespBO = calculatePrice(userId, settlementReqVO);
 
-//        TradePriceCalculateRespBO calculateRespBO = new TradePriceCalculateRespBO();
+        TradePriceCalculateRespBO calculateRespBO = new TradePriceCalculateRespBO();
         calculateRespBO.setPrice(new TradePriceCalculateRespBO.Price());
         calculateRespBO.getPrice().setPayPrice(allShopPayPrice);
         calculateRespBO.getPrice().setTotalPrice(allShopItemPrice);
         calculateRespBO.getPrice().setDeliveryPrice(allShopDeliveryPrice);
 
         //2.5 加载用户有的积分
-        MemberUserDO memberUserDO = memberUserMapper.selectById(userId);
-        Long memberPoints = memberUserDO.getCurrentMemberPoints();//用户当前积分
+//        MemberUserDO memberUserDO = memberUserMapper.selectById(userId);
+//        Long memberPoints = memberUserDO.getCurrentMemberPoints();//用户当前积分
+        IntegralDO integralDO = integralMapper.selectOne("user_id", userId);//查询出用户积分相关信息
+        Integer currentQuota = integralDO.getCurrentQuota();//获取用户当前积分
 
         // 3. 拼接返回
         AppTradeOrderSettlementRespVO respVO = TradeOrderConvert.INSTANCE.convert(calculateRespBO, address);
@@ -246,7 +248,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         respVO.setShopRespVOMap(shopRespVOMap);//保存每个店铺返回页面的 订单信息汇总
         respVO.setShopSkuIds(shopSkuIds);//把sku根据店聚合放到map中
         respVO.setShopNameMap(shopNameMap);
-        respVO.setCurrentMemberPoints(memberPoints);//用户当前积分
+        respVO.setCurrentQuota(currentQuota);//用户当前积分
 
 //        System.out.println("shopSkuIds@@@@@@@@"+shopSkuIds);
 //        System.out.println("shopNameMap@@@@@@@@"+shopNameMap);
@@ -379,7 +381,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         }
 
 
-        payPoints = 3;//为了测试方便，临时写死
+//        payPoints = 3;//为了测试方便，临时写死
 
         //计算订单含积分的各项商品价格
         TradePriceCalculateRespBO tradePriceCalculateRespBO = calculatePriceWithPoints(userId, createReqVO);

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/dal/dataobject/user/MemberUserDO.java

@@ -42,10 +42,10 @@ public class MemberUserDO extends TenantBaseDO {
      */
     @TableId
     private Long id;
-    /**
-     * 当前积分值
-     */
-    private Long currentMemberPoints;
+//    /**
+//     * 当前积分值
+//     */
+//    private Long currentMemberPoints;
     /**
      * 手机
      */

feifan-server/pom.xml

@@ -117,6 +117,18 @@
             <artifactId>feifan-spring-boot-starter-protection</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.newfeifan.zx</groupId>
+            <artifactId>feifan-module-distri-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.newfeifan.zx</groupId>
+            <artifactId>feifan-module-trade-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
     </dependencies>
 
     <build>

feifan-server/src/main/resources/application-dev.yaml

@@ -43,12 +43,12 @@ spring:
       primary: master
       datasource:
         master:
-          name: mall-feifan-dev
+          name: mall-feifan
           url: jdbc:mysql://10.0.5.229:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: wendao9t
           password: PA55W0RD
         slave: # 模拟从库，可根据自己需要修改
-          name: mall-feifan-dev
+          name: mall-feifan
           lazy: true # 开启懒加载，保证启动速度
           url: jdbc:mysql://10.0.5.229:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
           username: wendao9t