dd

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/ShopOrder.java

@@ -176,12 +176,6 @@ public class ShopOrder extends BaseTimeEntity {
      */
     private BigDecimal givePoint;
 
-    /**
-     * 赠送积分比例
-     */
-    private BigDecimal giftPointRatio;
-
-
     /**
      * 买家备注
      */

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/ShopOrderDetail.java

@@ -285,6 +285,11 @@ public class ShopOrderDetail extends BaseTimeEntity {
      * 平台商品分类ID
      */
     private Long productCategoryId;
+
+    /**
+     * 赠送积分比例
+     */
+    private BigDecimal givePointRate;
     /**
      * 单件需要赠送多少积分
      */

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/bo/ShopOrderBo.java

@@ -289,11 +289,6 @@ public class ShopOrderBo extends BaseTimeEntity {
     @NotNull(message = "赠送返否积分不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal givePoint;
 
-    /**
-     * 赠送积分比例
-     */
-    @ApiModelProperty(value = "赠送积分比例", required = true)
-    private BigDecimal giftPointRatio;
 
 
 

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/bo/ShopOrderDetailBo.java

@@ -450,6 +450,14 @@ public class ShopOrderDetailBo implements Serializable {
     @ApiModelProperty(value = "平台商品分类ID", required = true)
     private Long productCategoryId;
 
+
+    /**
+     * 赠送积分比例
+     */
+    @ApiModelProperty(value = "赠送积分比例", required = true)
+    @NotNull(message = "赠送积分比例不能为空", groups = {AddGroup.class, EditGroup.class})
+    private BigDecimal givePointRate;
+
     /**
      * 单件需要赠送多少
      */

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/vo/ShopOrderDetailVo.java

@@ -481,7 +481,11 @@ public class ShopOrderDetailVo extends BaseVo {
     private Boolean canGivePoint;
 
 
-
+    /**
+     * 赠送积分比例
+     */
+    @ApiModelProperty(value = "赠送积分比例", required = true)
+    private BigDecimal givePointRate;
     /**
      * 单件需要赠送多少
      */

ruoyi-shop/src/main/java/com/ruoyi/shop/order/domain/vo/ShopOrderVo.java

@@ -367,12 +367,6 @@ public class ShopOrderVo extends BaseVo {
     @ApiModelProperty("赠送返否积分")
     private BigDecimal givePoint;
 
-    /**
-     * 赠送积分比例
-     */
-    @ExcelProperty(value = "赠送积分比例")
-    @ApiModelProperty(value = "赠送积分比例", required = true)
-    private BigDecimal giftPointRatio;
 
     @ExcelProperty(value = "多少积分可以兑换1元钱")
     @ApiModelProperty("多少积分可以兑换1元钱")

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/createorder/impl/AbstractCreateOrderService.java

@@ -114,7 +114,6 @@ public abstract class AbstractCreateOrderService implements ICreateOrderService
         shopOrderBo.setUserUsePoint(createOrderBo.getUserUsePoint());
         BusinessSalesConfigVo salesConfig = businessSalesConfigService.getSalesConfig(shopOrderBo.getBusinessId());
         if (ObjectUtil.isNotNull(salesConfig)) {
-            shopOrderBo.setGiftPointRatio(salesConfig.getGiftPointRatio());
             shopOrderBo.setCashToPointsRatio(salesConfig.getCashToPointsRatio());
             shopOrderBo.setCurrentCashToPointsRatio(salesConfig.getCashToPointsRatio());
             shopOrderBo.setPointsToCashRatio(salesConfig.getPointsToCashRatio());
@@ -208,6 +207,7 @@ public abstract class AbstractCreateOrderService implements ICreateOrderService
             shopOrderDetailBo.setTotalVolume(MathUtils.multiply(shopOrderDetailBo.getSingleVolume(), productNum));
             shopOrderDetailBo.setProductCategoryId(product.getMerchantCategoryId());
             shopOrderDetailBo.setCanGivePoint(product.getCanGivePoint());
+            shopOrderDetailBo.setGivePointRate(product.getGivePointRate());
             shopOrderDetailBo.setGiveBackPoint(BigDecimal.ZERO);
             shopOrderDetailBo.setTotalGiveBackPoint(BigDecimal.ZERO);
             if (!product.getFreeShippingStatus()) {
@@ -252,19 +252,16 @@ public abstract class AbstractCreateOrderService implements ICreateOrderService
 
     // 赠送积分处理
     public void givePointHandle(ShopOrderBo shopOrderBo) {
-        if (shopOrderBo.getGiftPointRatio().compareTo(BigDecimal.ZERO)<=0) {
-            return;
-        }
         List<ShopOrderDetailBo> shopOrderDetailBoList = shopOrderBo.getShopOrderDetailBoList();
         for (ShopOrderDetailBo shopOrderDetailBo : shopOrderDetailBoList) {
             if (shopOrderDetailBo.getCanGivePoint()) {
-                if(shopOrderDetailBo.getPaymentAmount().compareTo(BigDecimal.ZERO)<=0)
+                if(shopOrderDetailBo.getPaymentAmount().compareTo(BigDecimal.ZERO)<=0 || shopOrderDetailBo.getGivePointRate().compareTo(BigDecimal.ZERO)==0)
                 {
                     shopOrderDetailBo.setGiveBackPoint(BigDecimal.ZERO);
                     shopOrderDetailBo.setTotalGiveBackPoint(BigDecimal.ZERO);
                     continue;
                 }
-                BigDecimal totalGiveBackPoint = shopOrderDetailBo.getPaymentAmount().multiply(shopOrderBo.getGiftPointRatio()).multiply(shopOrderBo.getPointsToCashRatio());
+                BigDecimal totalGiveBackPoint = shopOrderDetailBo.getPaymentAmount().multiply(shopOrderDetailBo.getGivePointRate()).multiply(shopOrderBo.getPointsToCashRatio());
                 shopOrderDetailBo.setTotalGiveBackPoint(totalGiveBackPoint.divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP));
                 shopOrderDetailBo.setGiveBackPoint(shopOrderDetailBo.getTotalGiveBackPoint().divide(new BigDecimal(shopOrderDetailBo.getProductNum()), 2, RoundingMode.HALF_UP));
             }

ruoyi-shop/src/main/java/com/ruoyi/shop/product/domain/Product.java

@@ -206,6 +206,11 @@ public class Product extends BaseEntity {
      */
     private Boolean canGivePoint;
 
+    /**
+     * 赠送积分率
+     */
+    private BigDecimal givePointRate;
+
 
     /**
      * 是否可以自提（false：否，true：是）

ruoyi-shop/src/main/java/com/ruoyi/shop/product/domain/bo/ProductBo.java

@@ -251,6 +251,12 @@ public class ProductBo extends BaseEntity {
     @NotNull(message = "是否可以赠送积分不能为空", groups = { AddGroup.class, EditGroup.class })
     private Boolean canGivePoint;
 
+    /**
+     * 赠送积分率
+     */
+    @ApiModelProperty(value = "赠送积分率", required = true)
+    private BigDecimal givePointRate;
+
 
     /**
      * 是否可以自提（false：否，true：是）

ruoyi-shop/src/main/java/com/ruoyi/shop/product/domain/vo/ProductVo.java

@@ -286,6 +286,14 @@ public class ProductVo extends BaseVo {
     private Boolean canGivePoint;
 
 
+    /**
+     * 赠送积分率
+     */
+    @ExcelProperty(value = "赠送积分率")
+    @ApiModelProperty(value = "赠送积分率", required = true)
+    private BigDecimal givePointRate;
+
+
     /**
      * 是否可以自提（false：否，true：是）
      */

ruoyi-shop/src/main/resources/mapper/order/ShopOrderDetailMapper.xml

@@ -57,6 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="rightsNum" column="rights_num"/>
         <result property="rightsStatus" column="rights_status"/>
         <result property="productCategoryId" column="product_category_id"/>
+        <result property="canGivePoint" column="can_give_point"/>
+        <result property="givePointRate" column="give_point_rate"/>
         <result property="giveBackPoint" column="give_back_point"/>
         <result property="totalGiveBackPoint" column="total_give_back_point"/>
         <result property="end" column="end"/>

ruoyi-shop/src/main/resources/mapper/product/ProductMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="merchantCategoryId" column="merchant_category_id"/>
         <result property="videoUrl" column="video_url"/>
         <result property="canGivePoint" column="can_give_point"/>
+        <result property="givePointRate" column="give_point_rate"/>
         <result property="canSelfPickup" column="can_self_pickup"/>
         <result property="average" column="average"/>
         <result property="pv" column="pv"/>