核销商品券传商品原价

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -3813,6 +3813,7 @@ public class OrderSdkAdapter {
                         couponCodeVerificationProductDto.setPid(pid);
                         couponCodeVerificationProductDto.setConsume_num(productDiscount.getDiscountQty());
                         couponCodeVerificationProductDto.setSeq(i + 1);
+                        couponCodeVerificationProductDto.setRedeem_price(new BigDecimal(productBean.getPrice()));
                         products.add(couponCodeVerificationProductDto);
                     }
                 }

order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java

@@ -920,7 +920,8 @@ public class CreateOrderAdapter {
                     .accountType(getQueryOrderAccountType(getOrderAccountType(activityDiscountsDto.getActivityType())))
                     .sequence(createOrderProductDto.getSequence())
                     .productId(material.getSpuId())
-                    .discountQty(createOrderProductDto.getNumber())
+                    .discountQty((activityDiscountsDto.getActualActivityGoodsNumber() == null || activityDiscountsDto.getActualActivityGoodsNumber() == 0)
+                            ? createOrderProductDto.getNumber() : activityDiscountsDto.getActualActivityGoodsNumber())
                     .build();
             orderAccountDtos.add(createOrderAccountDto);
         }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -462,7 +462,8 @@ public class OrderAdapter {
                     .accountType(getQueryOrderAccountType(getOrderAccountType(activityDiscountsDto.getActivityType())))
                     .sequence(createOrderProductDto.getSequence())
                     .productId(createOrderProductDto.getSpecification())
-                    .discountQty(createOrderProductDto.getNumber())
+                    .discountQty((activityDiscountsDto.getActualActivityGoodsNumber() == null || activityDiscountsDto.getActualActivityGoodsNumber() == 0)
+                            ? createOrderProductDto.getNumber() : activityDiscountsDto.getActualActivityGoodsNumber())
                     .build();
             orderAccountDtos.add(createOrderAccountDto);
         }

order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java

@@ -50,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -148,6 +149,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
                             couponCodeVerificationProductDto.setPID(pid);
                             couponCodeVerificationProductDto.setConsume_num(productDiscount.getDiscountQty());
                             couponCodeVerificationProductDto.setSeq(i + 1);
+                            couponCodeVerificationProductDto.setRedeem_price(new BigDecimal(productBean.getPrice()));
                             products.add(couponCodeVerificationProductDto);
                         }
                     }