券核销接口字段添加

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

@@ -37,6 +37,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCouponSdkService;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType;
 import com.freemud.application.sdk.api.service.EmailAlertService;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
@@ -100,7 +101,10 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
                 CouponCodeVerificationDto couponCodeVerificationDto = couponAdapter.convert2CouponCodeVerificationDto(activityChannelEnum, accountBean.getAccountId(), orderBean.getOid(), orderBean.getCompanyId(), orderBean.getShopId(), orderBean.getUserId(), products, accountBean.getPrice().intValue(),couponReqType);
                 couponCodeVerificationDto.setOrderTotalAmount(orderBean.getOriginalAmount()==null ? 0L: orderBean.getOriginalAmount().longValue());
                 couponCodeVerificationDto.setOrderPaymentAmount(orderBean.getAmount());
-                couponCodeVerificationDto.setOrderDiscountAmount(Math.abs(accountList.stream().mapToLong(account->account.getShopDiscountAmount()==null?0L:account.getShopDiscountAmount()).sum()));
+                couponCodeVerificationDto.setOrderDiscountAmount(orderBean.getOrderSettlementDetailList() == null? 0L :
+                        Math.abs(orderBean.getOrderSettlementDetailList().stream().
+                                filter(a -> ("0".equals(a.getProductId()) || StringUtils.isBlank(a.getProductId())) && OrderSettlementType.DISCOUNT_FEE.getIndex() != a.getSettlementType().intValue()).
+                                    mapToLong(a -> a.getShopDiscountAmount()==null?0L: a.getShopDiscountAmount()).sum()));
                 // 核销券新增参数：组织机构ID
                 couponCodeVerificationDto.setChannel_codes(storeService.getOrgIdsArr(orderBean.getCompanyId(), orderBean.getShopId()));
                 try {