农工商

order-application-service/src/main/java/cn/freemud/entities/dto/GetCouponDetailResponseDto.java

@@ -80,6 +80,10 @@ public class GetCouponDetailResponseDto {
         private String startString;
         @JsonProperty("State")
         private Integer state;
+        @JsonProperty("SalePrice")
+        private Integer salePrice;
+        @JsonProperty("OriginalPrice")
+        private Integer originalPrice;
         @JsonProperty("Type")
         private Integer type;
     }

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

@@ -536,25 +536,23 @@ public class SellCouponOrderServiceImpl {
         GetCouponDetailResponseDto memberCoupon = couponService.getMemberCoupon(GetMemberCouponRequestVo.builder()
                 .partnerId(partnerId)
                 .couponCode(activityCode).build());
-        GetCouponDetailResponseDto.ActiveProduct activeProduct = memberCoupon.getDetails().get(0).getActiveProduct().get(0);
+        GetCouponDetailResponseDto.Active active = memberCoupon.getDetails().get(0).getActive();
         // GetMenuCategoryInfoResponse.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean productBean = productInfosResponse.getProducts().get(0);
         //订单原始金额，单位分
         //用户在界面上看到的支付金额
-        Long origianlPrice = pointToFen(activeProduct.getPriceOriginal().doubleValue());
-        Long discountPrice = pointToFen(activeProduct.getPriceDiscount().doubleValue());
-        long salePrice = origianlPrice - discountPrice;
 
-        request.setSettlementAmount(salePrice);
+
+        request.setSettlementAmount(active.getSalePrice().longValue());
         //实际支付现金金额，扣除支付自生优惠，单位分`
-        request.setActualPayAmount(salePrice);
-        request.setOriginalAmount(origianlPrice);
+        request.setActualPayAmount(active.getSalePrice().longValue());
+        request.setOriginalAmount(active.getOriginalPrice().longValue());
         request.setOrderType(OrderType.GENERAL_DINE_IN.getIndex());
         //商品信息转换
         List<OrderItemCreateReq> orderItemList = new ArrayList<>();
         OrderItemCreateReq orderItemCreateReq = new OrderItemCreateReq();
-        orderItemCreateReq.setSalePrice(salePrice);
-        orderItemCreateReq.setProductPrice(origianlPrice);
-        orderItemCreateReq.setSettlementPrice(salePrice);
+        orderItemCreateReq.setSalePrice(active.getSalePrice().longValue());
+        orderItemCreateReq.setProductPrice(active.getOriginalPrice().longValue());
+        orderItemCreateReq.setSettlementPrice(active.getSalePrice().longValue());
         orderItemCreateReq.setPartnerId(partnerId);
 
         orderItemCreateReq.setProductId(ngsCouponProductId);
@@ -569,18 +567,15 @@ public class SellCouponOrderServiceImpl {
         OrderProductAddInfoDto orderProductAddInfoDto = new OrderProductAddInfoDto();
         List<ProductBindingCouponType> productBindingCoupons = new ArrayList<>();
         GetCouponDetailResponseDto.Details detail = memberCoupon.getDetails().get(0);
-        List<GetCouponDetailResponseDto.ActiveProduct> activeProduct1 = detail.getActiveProduct();
         ProductBindingCouponType productBindingCouponType2 = new ProductBindingCouponType();
         productBindingCouponType2.setActivityCode(detail.getActiveCode());
-        productBindingCouponType2.setNum(activeProduct1.get(0).getAmount());
+        productBindingCouponType2.setNum(1);
         productBindingCouponType2.setActivityName(detail.getActive().getActiveName());
         productBindingCoupons.add(productBindingCouponType2);
         orderProductAddInfoDto.setProductBindingCoupons(productBindingCoupons);
         orderItemCreateReq.setExtInfo(JSONObject.toJSONString(orderProductAddInfoDto));
         orderItemList.add(orderItemCreateReq);
 
-
-
         //商品信息赋值
         request.setOrderItemList(orderItemList);
         //收货人信息转换