Merge branch 'dev/2024/0607/update-app-Y' of feifan/mall-backend-app into master

修改订单计算

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

@@ -5,7 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.AssertTrue;
-import java.math.BigDecimal;
 import java.util.Map;
 
 @Schema(description = "用户 App - 交易订单创建 Request VO")
@@ -18,7 +17,7 @@ public class AppTradeOrderCreateReqVO extends AppTradeOrderSettlementReqVO {
 
     //add by Ben
     @Schema(description = "本订单使用积分，为一整数", example = "36")
-    private BigDecimal payIntegral;
+    private Double payIntegral;
 
     @Schema(description = "【本属性已不作页面与后台传值使用，被shopRemarks替代。本属性只作java内部使用】备注", example = "这个是我的订单哟")
     private String remark;

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

@@ -1,12 +1,10 @@
 package cn.newfeifan.mall.module.trade.controller.app.order.vo;
 
 import cn.newfeifan.mall.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
-import cn.newfeifan.mall.module.trade.enums.order.TradeOrderRefundStatusEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.List;
 
 @Schema(description = "用户 App - 订单交易的明细 Response VO")
@@ -15,7 +13,7 @@ public class AppTradeOrderDetailRespVO {
 
     //========使用积分=================
     @Schema(description = "订单使用积分", example = "8900000")
-    private Long payIntegral;
+    private Double payIntegral;
 
     // ========== 订单基本信息 ==========
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -34,7 +34,7 @@ public class TradeOrderDO extends BaseDO {
 
     //本商品使用积分 add by Ben payIntegral
 //    private Integer payPoints;
-    private Long payIntegral;
+    private Double payIntegral;
 
     //退还的使用的积分 add by Ben
     private Long refundIntegral;

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

@@ -505,12 +505,12 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         }
 
         //消费者在页面录入的，要使用的积分
-        BigDecimal payPoints = createReqVO.getPayIntegral();
+        Double payPoints = createReqVO.getPayIntegral();
 
         if (payPoints == null) {
-            payPoints = BigDecimal.valueOf(0);
+            payPoints = (double) 0;
         } else {//把页面传入的，1积分=1元钱的积分，转换为后台保存到数据库的积分值
-            payPoints = BigDecimal.valueOf(payPoints.longValue() * DistriConstants.INTEGRAL_PAGE2DB);
+            payPoints = payPoints * DistriConstants.INTEGRAL_PAGE2DB;
         }
 
 
@@ -592,7 +592,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
             order.setShopId(shopId);
             order.setPayPrice(shopPayPrice);
             order.setPayRmb(shopPayPrice);
-            order.setPayIntegral(shopPayPoints);
+            order.setPayIntegral(shopPayPoints.doubleValue());
 
             tradeOrderMapper.insert(order);
 
@@ -636,12 +636,12 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         }
 
         //如果订单有使用积分，则抵扣用户的积分。add by Ben
-        if (payPoints.compareTo(BigDecimal.valueOf(0L)) >= 0) {
+        if (payPoints > 0) {
             for (Map<String, Object> m : orderMapList) {
                 TradeOrderDO order = (TradeOrderDO) (m.get("order"));
                 Long tradeOrderId = order.getId();
                 String OrderNum = order.getNo();
-                Long payIntegral = order.getPayIntegral();//每个订单使用的积分
+                Long payIntegral = order.getPayIntegral().longValue();//每个订单使用的积分
                 integralService.updateUserIntegral(userId,userId, CaclEnum.ORDER_PAY_INTEGRAL, payIntegral * (-1), 0L, tradeOrderId, OrderNum);
             }
         }
@@ -1303,7 +1303,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         cancelOrder0(order, TradeOrderCancelTypeEnum.MEMBER_CANCEL);
 
         //3.退回订单已支付的积分 add by Ben
-        Long payIntegral = order.getPayIntegral();//每个订单使用的积分
+        Long payIntegral = order.getPayIntegral().longValue();//每个订单使用的积分
         Long tradeOrderId = order.getId();
         String orderNum = order.getNo();
         //如果订单有使用积分，则退回积分
@@ -1334,7 +1334,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
                 getSelf().cancelOrderBySystem(order);
 
                 //退回订单已支付的积分 add by Ben
-                Long payIntegral = order.getPayIntegral();//每个订单使用的积分
+                Long payIntegral = order.getPayIntegral().longValue();//每个订单使用的积分
                 Long tradeOrderId = order.getId();
                 String orderNum = order.getNo();
                 Long userId = order.getUserId();

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

@@ -248,7 +248,7 @@ feifan:
     end-code: 9999 # 这里配置 9999 的原因是，测试方便。
   trade:
     order:
-      app-id: 9 # 商户编号
+      app-id: 11 # 商户编号
       pay-expire-time: 2h # 支付的过期时间
       receive-expire-time: 14d # 收货的过期时间
       comment-expire-time: 7d # 评论的过期时间