支付渠道添加判断是否为微信支付，如果是则锁定，否则核销

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

@@ -220,16 +220,35 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             }
         }
 
-        // 下单成锁定劵，冻结失败提示下单失败并冲正库存积分等
-        CouponLockRequest couponLockRequest = orderSdkAdapter.convert2CouponLockRequest(orderBean, accounts);
-        if (couponLockRequest!=null){
-            BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.couponLock(couponLockRequest, "");
-            if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) {
-                CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
-                orderCancel(cancelOrderRequest);
-                //失败异步冲正库存，取消订单
-                backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
-                return BaseOrderResponse.getErrorBaseOrderResponse(couponLockResponseBaseResponse.getCode(), couponLockResponseBaseResponse.getMessage());
+        // 下单成锁定劵，冻结失败提示下单失败并冲正库存积分等,判断支付渠道，积分和svc卡直接核销，无需锁定
+        if(orderBean.getPayChannel().equalsIgnoreCase("10211")){
+            CouponLockRequest couponLockRequest = orderSdkAdapter.convert2CouponLockRequest(orderBean, accounts);
+            if (couponLockRequest != null) {
+                BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.couponLock(couponLockRequest, "");
+                if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) {
+                    CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
+                    orderCancel(cancelOrderRequest);
+                    //失败异步冲正库存，取消订单
+                    backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
+                    return BaseOrderResponse.getErrorBaseOrderResponse(couponLockResponseBaseResponse.getCode(), couponLockResponseBaseResponse.getMessage());
+                }
+            }
+        }else{
+            // 核销优惠券，核销失败提示下单失败并冲正库存积分等
+            CouponRequest couponVerificationRequest = orderSdkAdapter.convert2CouponVerificationRequest(orderBean, accounts);
+            if (couponVerificationRequest!=null){
+                // 核销券新增参数：组织机构
+                couponVerificationRequest.setChannel_codes(this.getOrgIds(orderBean.getCompanyId(), orderBean.getShopId()));
+                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(), "核销券码失败");
+                }
             }
         }
 
@@ -1557,4 +1576,21 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         }
         return minTime;
     }
+
+    /**
+     * 查询门店的组织机构
+     * @param partnerId
+     * @param storeCode
+     * @return
+     */
+    private List<String> getOrgIds(String partnerId, String storeCode) {
+        GetOrgTreeListRequest request = new GetOrgTreeListRequest();
+        request.setPartnerId(partnerId);
+        request.setStoreCode(storeCode);
+        BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
+        if (orgList != null && ResponseResult.SUCCESS.getCode().equals(orgList.getCode())) {
+            return orgList.getData();
+        }
+        return null;
+    }
 }

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

@@ -1254,6 +1254,8 @@ public class OrderServiceImpl implements Orderservice {
                 sendApplyRefundSubscriptionNotice(orderBean, orderRefundVo);
                 //已接单可发起退款申请，查询门店有无云打印机，有则打印退款申请小票
                 printApplyRefundSmallTicket(orderBean, orderRefundVo);
+                //发送消息，冲正券
+                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             }
         }
         return ResponseUtil.success();