解决分支冲突问题

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -135,9 +135,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         }
         BaseOrderResponse baseOrderResponse = updateStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
                 config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest(),config.getBaseCreateOrderRequest().getMenuType());
-//        if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
-//            return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
-//        }
+        if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
+            return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
+        }
         return createOrderResponse;
     }
 
@@ -154,8 +154,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             return CreateFatherSonOrderResponse.error("500", "");
         }
         CreateFatherSonOrderRequest.OrderInfo productOrderRequest = createFatherSonOrderRequest.getOrderInfoList().stream().filter(orderBeanTemp -> 1 == orderBeanTemp.getBizType()).collect(Collectors.toList()).get(0);
-        updateStockAndScore(productOrderInfo.get(0), productOrderRequest.getProducts(), productOrderRequest.getActivityUpdateStockRequest(), productOrderRequest.getAccounts(),
+        BaseOrderResponse baseOrderResponse =updateStockAndScore(productOrderInfo.get(0), productOrderRequest.getProducts(), productOrderRequest.getActivityUpdateStockRequest(), productOrderRequest.getAccounts(),
                 createFatherSonOrderRequest.getMqMessageRequest(),createFatherSonOrderRequest.getMenuType());
+        if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
+            return CreateFatherSonOrderResponse.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg());
+        }
         return createFatherSonOrderResponse;
     }
 
@@ -214,11 +217,24 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 orderCancel(cancelOrderRequest);
                 //失败异步冲正库存，取消订单
                 backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
-                userScoreRequest = orderSdkAdapter.convent2UserScoreRequest(orderBean, accounts, false);
-                memberScoreService.useScore(userScoreRequest, "");
                 return BaseOrderResponse.getErrorBaseOrderResponse(userScoreResponse.getCode(), "积分不足");
             }
         }
+        // 核销优惠券，核销失败提示下单失败并冲正库存积分等
+        CouponRequest couponVerificationRequest = orderSdkAdapter.convert2CouponVerificationRequest(orderBean, accounts);
+        if (couponVerificationRequest!=null){
+            BaseResponse<CouponRedeemResponse> couponRedeemResponseBaseResponse = offlineCouponSdkService.couponRedeem(couponVerificationRequest, "");
+            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponRedeemResponseBaseResponse.getCode())) {
+                //TODO 失败取消订单,异步冲正库存
+                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
+                        AfterSalesType.SYSTEM_CANCEL, "异常订单取消", "", null);
+                orderCancel(cancelOrderRequest);
+                //失败异步冲正库存，取消订单
+                backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
+                return BaseOrderResponse.getErrorBaseOrderResponse(couponRedeemResponseBaseResponse.getCode(), "核销券码失败");
+            }
+        }
+
         return BaseOrderResponse.getErrorBaseOrderResponse(RESPONSE_SUCCESS_STR, "");
     }
 
@@ -246,7 +262,6 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             request.setOrderSettlementDetailList(orderSettlementCreateReqs);
         }
         request.setActualPayAmount(confirmOrderRequest.getActualPayAmount());
-//        request.setActualPayAmount(request.getActualPayAmount());
         request.setOperator(confirmOrderRequest.getOperator());
         QueryOrderByIdResponse orderByIdResponse=new QueryOrderByIdResponse();
         BaseResponse<GetMemberExtendInfoResponse> extendInfo=new BaseResponse();
@@ -269,7 +284,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
 
         }
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> response = orderSdkService.paySuccess(request, confirmOrderRequest.getTrackingNo());
-        //获取会员信息直接返回，非空判断
+        //获取会员信息失败直接返回，非空判断
         if(extendInfo.getData() == null){
             return orderSdkAdapter.convent2PayAccessResponse(response);
         }