判断修改

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

@@ -883,7 +883,7 @@ public class CouponAdapter {
         }
         // fisherman  begin 筛选订单级别优惠
         List<OrderSettlementResp> orderCouponSettlementList = orderBean.getOrderSettlementDetailList().stream().filter(orderSettlement ->
-                        Objects.equals("0",orderSettlement.getProductId()) && (
+                        Objects.equals("",orderSettlement.getProductId()) && (
                                 orderSettlement.getSettlementType().equals(OrderSettlementType.CASH_COUPON.getIndex())
                                         || orderSettlement.getSettlementType().equals(OrderSettlementType.PRODUCT_COUPON.getIndex())
                                         || orderSettlement.getSettlementType().equals(OrderSettlementType.DISCOUNT_COUPON.getIndex())

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

@@ -325,7 +325,7 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
 //            request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
             request.getStoreInfo().setChannelIdList(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
             BaseResponse couponLockResponseBaseResponse = offlineCouponSdkService.preCheckAndLock(request);
-            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) {
+            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getStatusCode())) {
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单