Browse Source

修改下单事在订单项中加入商品的成本价,推广费

Yangzw 9 months ago
parent
commit
0e7e6039c7

+ 12 - 0
feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderItemDO.java

@@ -180,8 +180,20 @@ public class TradeOrderItemDO extends BaseDO {
     private Integer afterSaleStatus;
 
 //    @TableField(exist = false)
+    /**
+     * 高精度价格
+     */
     private BigDecimal highPrecisionPrice;
 
+    /**
+     * 推广费, 单位: 分
+     */
+    private Integer promotionFee;
+    /**
+     * 成本价,单位: 分
+     */
+    private Integer costPrice;
+
     /**
      * 商品属性
      */

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

@@ -678,9 +678,12 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
             TradeOrderDO order = buildTradeOrder(userId, shopCreateReqVO, calculateRespBO);
             List<TradeOrderItemDO> orderItems = buildTradeOrderItems(order, calculateRespBO);
 
+            // 订单项高精度价格,成本,推广费计算
             for (TradeOrderItemDO orderItem : orderItems) {
                 ProductSkuDO productSkuDO = productSkuMapper.selectById(orderItem.getSkuId());
                 orderItem.setHighPrecisionPrice(productSkuDO.getHighPrecisionPrice());
+                orderItem.setCostPrice(productSkuDO.getCostPrice());
+                orderItem.setPromotionFee(productSkuDO.getPromotionFee());
             }
 
             // 2. 订单创建前的逻辑

+ 1 - 1
feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/user/MemberUserServiceImpl.java

@@ -204,7 +204,7 @@ public class MemberUserServiceImpl implements MemberUserService {
         }
         // 2.2 使用新验证码
         smsCodeApi.useSmsCode(new SmsCodeUseReqDTO().setMobile(reqVO.getMobile()).setCode(reqVO.getCode())
-                .setScene(SmsSceneEnum.MEMBER_UPDATE_MOBILE.getScene()).setUsedIp(getClientIP()));
+                .setScene(SmsSceneEnum.MEMBER_UPDATE_NEW_MOBILE.getScene()).setUsedIp(getClientIP()));
 
         // 3. 更新用户手机
         memberUserMapper.updateById(MemberUserDO.builder().id(userId).mobile(reqVO.getMobile()).build());