Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop

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(), "核销券码失败");
+                }
             }
         }
 
@@ -1561,4 +1580,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/CouponActivityServiceImpl.java

@@ -102,7 +102,9 @@ public class CouponActivityServiceImpl implements CouponActivityService {
                 try {
                     //71.券核销
                     for (int i = 2; i >= 0; i--) {
+                        LogUtil.info("核销券码开始==", JSON.toJSONString(couponCodeVerificationDto), null);
                         CouponCodeResponseDto couponCodeResponseDto = couponOfflineClient.verification(couponCodeVerificationDto);
+                        LogUtil.info("核销券码返回==", JSON.toJSONString(couponCodeVerificationDto), null);
                         ThirdPartyLog.infoConvertJson(System.currentTimeMillis(), System.currentTimeMillis(), "/api", couponCodeVerificationDto, couponCodeResponseDto);
                         if (Objects.equals(couponCodeResponseDto.getStatusCode(), ResponseResult.SUCCESS.getCode())) {
                             LogUtil.info("CouponReverseServiceImpl", JSON.toJSONString(couponCodeVerificationDto), JSON.toJSONString(couponCodeResponseDto));

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

@@ -400,8 +400,8 @@ public class OrderServiceImpl implements Orderservice {
         if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
             return sendPaySuccessNoticeMessage();
         }
-        //若该订单使用了优惠券，则移除卡包,移除失败也不退款
-        couponActivityService.callbackNotify(orderBean);
+        //若该订单使用了优惠券，则移除卡包,移除失败也不退款，现在支付成功个调用核销，无需调用此功能
+//        couponActivityService.callbackNotify(orderBean);
         // 订单失败后 发消息重试 待实现
         String takeCode;
         String daySeq;
@@ -570,7 +570,9 @@ public class OrderServiceImpl implements Orderservice {
         if (jsonObject.containsKey("code")) {
             Integer code = (Integer) jsonObject.get("code");
             if (Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_0, code) || Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, code)) {
+                log.info("调用券码核销=="+newMessage.getTransId());
                 verificationCoupon(newMessage.getTransId());
+                log.info("调用券码结束=="+newMessage.getTransId());
                 return newSendPaySuccessNoticeMessage();
             } else {
                 return newSendPayFaileMessage();
@@ -1554,6 +1556,8 @@ public class OrderServiceImpl implements Orderservice {
                 sendApplyRefundSubscriptionNotice(orderBean, orderRefundVo);
                 //已接单可发起退款申请，查询门店有无云打印机，有则打印退款申请小票
                 printApplyRefundSmallTicket(orderBean, orderRefundVo);
+                //发送消息，冲正券
+                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             }
         }
         return ResponseUtil.success();
@@ -1636,24 +1640,6 @@ public class OrderServiceImpl implements Orderservice {
         }
     }
 
-    public void backOrdersStatusChange(String oid, Integer orderStatus,Integer payState) {
-        if (StringUtils.isEmpty(oid)) {
-            return;
-        }
-        ApiLog.info("backOrdersStatusChange", oid, String.valueOf(orderStatus));
-        OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
-        requestDto.setOid(oid);
-        requestDto.setOrderStatus(orderStatus);
-
-        try {
-            Header header = new Header(MQAction.INSERT.getAction(), "backOrdersStatusChange", oid, backOrdersChangeOrderStatusConsumerQueue);
-            MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
-            mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
-        } catch (Exception e) {
-            LogUtil.error("ActivityReverse", JSON.toJSONString(requestDto), "", e);
-        }
-    }
-
     /**
      * 发MQ去打印
      *