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

@@ -947,10 +947,10 @@ public class CouponAdapter {
         orderCouponSettlementList.forEach(orderSettlement -> {
             //商品券参数
             List<PreCheckAndLockReq.ProductInfo> products = null;
-            if (orderSettlement.getSettlementType().equals(OrderSettlementType.PRODUCT_COUPON.getIndex())) {
+            if (!orderSettlement.getSettlementType().equals(OrderSettlementType.FREIGHT_COUPON.getIndex())) {
                 products = new ArrayList<>();
                 List<OrderSettlementResp> couponProductList = orderBean.getOrderSettlementDetailList().stream().filter(productSettlement ->
-                                !Objects.equals("0",productSettlement.getProductId())
+                                !Objects.equals("",productSettlement.getProductId())
                                 && Objects.equals(orderSettlement.getExternalObjectId(),productSettlement.getExternalObjectId())
                                 && OrderSettlementType.PRODUCT_COUPON.getIndex().equals(productSettlement.getSettlementType())
                 ).collect(Collectors.toList());

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

@@ -3,6 +3,7 @@ package cn.freemud.service.business.impl;
 import cn.freemud.adapter.CouponAdapter;
 import cn.freemud.amqp.MQService;
 import cn.freemud.base.util.DateUtil;
+import cn.freemud.entities.dto.CouponCodeResponseDto;
 import cn.freemud.entities.dto.GetMemberExtendInfoRequestDto;
 import cn.freemud.entities.dto.GetMemberExtendInfoResponseDto;
 import cn.freemud.entities.dto.GetUserScoreUserDetailDto;
@@ -324,13 +325,13 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
         if (request != null) {
 //            request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
             request.getStoreInfo().setChannelIdList(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
-            BaseResponse couponLockResponseBaseResponse = offlineCouponSdkService.preCheckAndLock(request);
+            CouponCodeResponseDto couponLockResponseBaseResponse = offlineCouponSdkService.preCheckAndLock(request);
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getStatusCode())) {
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 orderQueueService.backOrdersStatusChange(orderBean.getOid(),orderBean.getStatus());
-                return BaseOrderResponse.getErrorBaseOrderResponse(couponLockResponseBaseResponse.getCode(), couponLockResponseBaseResponse.getMessage());
+                return BaseOrderResponse.getErrorBaseOrderResponse(couponLockResponseBaseResponse.getStatusCode(), couponLockResponseBaseResponse.getMsg());
             }
         }
         return BaseOrderResponse.getErrorBaseOrderResponse(RESPONSE_SUCCESS_STR, "");

order-application-service/src/main/java/cn/freemud/service/thirdparty/CouponOfflineClient.java

@@ -23,5 +23,5 @@ public interface CouponOfflineClient {
      */
     @LogIgnoreFeign(logMessage="precheckAndLock",messageFieldName= ResponseCodeKeyConstant.MSG,statusCodeFieldName=ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("/standard/checkandlock")
-    BaseResponse preCheckAndLock(PreCheckAndLockReq couponCodeVerificationDto);
+    CouponCodeResponseDto preCheckAndLock(PreCheckAndLockReq couponCodeVerificationDto);
 }