Merge branches 'develop' and 'feature/20211229_券预校验锁定对接_wuping' of…

Merge branches 'develop' and 'feature/20211229_券预校验锁定对接_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -952,13 +952,20 @@ public class CouponAdapter {
                 List<OrderSettlementResp> couponProductList = orderBean.getOrderSettlementDetailList().stream().filter(productSettlement ->
                                 !Objects.equals("",productSettlement.getProductId())
                                 && Objects.equals(orderSettlement.getExternalObjectId(),productSettlement.getExternalObjectId())
-                                && OrderSettlementType.PRODUCT_COUPON.getIndex().equals(productSettlement.getSettlementType())
+                                && orderSettlement.getSettlementType().equals(productSettlement.getSettlementType())
                 ).collect(Collectors.toList());
 
                 for (OrderSettlementResp couponProduct : couponProductList){
                     PreCheckAndLockReq.ProductInfo productInfo = new PreCheckAndLockReq.ProductInfo();
                     productInfo.setProductId(couponProduct.getProductId());
-                    //商品名称　原价从订单商品获取
+                    //商品名称/原价从订单商品获取
+                    for (ProductBeanV1 productBeanV1 : orderBean.getProductList()){
+                        if(couponProduct.getProductId().equals(productBeanV1.getSpecification()) && couponProduct.getProductSeq().equals(productBeanV1.getSequence())){
+                            productInfo.setProductName(productBeanV1.getSpecificationName());
+                            productInfo.setTotalPrice(productBeanV1.getPrice().intValue()*productBeanV1.getNumber());
+                            break;
+                        }
+                    }
 
                     productInfo.setQty(couponProduct.getNumber());
                     productInfo.setCouponDiscountTotalAmount(Math.abs(couponProduct.getSettlementAmount().intValue()));