Merge branch 'feature/2.1.0_核销优惠券增加参数' into qa

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

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

@@ -89,7 +89,6 @@ import java.util.stream.Collectors;
 import static com.freemud.application.sdk.api.membercenter.constant.InterfaceAddressConstant.MEMBER_EXTEND_INFO;
 import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS;
 import static com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR;
-
 @Import(ManagerOrderBeanConfig.class)
 @Service
 public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@@ -229,33 +228,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         }
 
         // 下单成锁定劵，冻结失败提示下单失败并冲正库存积分等,判断支付渠道，积分和svc卡直接核销，无需锁定10102 = svc卡支付 || 支付金额小于等于0
-        // 混合支付
-        OrderBean.OrderPayItem svc = null;
-        if (CollectionUtils.isNotEmpty(orderBean.getOrderPayItem()) && orderBean.getOrderPayItem().size()==1) {
-             svc = orderBean.getOrderPayItem().stream()
-                     .filter(e ->e.getPayChannelType()!=null && e.getPayChannelType().equals(PayChannelType.SVC.getIndex().intValue()))
-                     .findFirst()
-                     .orElse(null);
-        }
-        //svc 或是混合svc支付直接核销
-        if((!StringUtils.isEmpty(orderBean.getPayChannel()) && orderBean.getPayChannel().equalsIgnoreCase("10102")) || orderBean.getAmount() <=0 || (svc!=null) ){
-            // 核销优惠券，核销失败提示下单失败并冲正库存积分等
-            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(), "核销券码失败");
-                }
-            }
-        }else{
+        //todo:统一流程 下单锁券再核销
         CouponLockRequest couponLockRequest = orderSdkAdapter.convert2CouponLockRequest(orderBean, accounts);
         if (couponLockRequest != null) {
             BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.couponLock(couponLockRequest, "");
@@ -267,8 +240,6 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 return BaseOrderResponse.getErrorBaseOrderResponse(couponLockResponseBaseResponse.getCode(), couponLockResponseBaseResponse.getMessage());
             }
         }
-
-        }
         return BaseOrderResponse.getErrorBaseOrderResponse(RESPONSE_SUCCESS_STR, "");
     }
 

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

@@ -149,6 +149,7 @@ public class CouponAdapter {
         couponCodeVerificationDto.setStation_id("-1");
         couponCodeVerificationDto.setOperator_id("-1");
         couponCodeVerificationDto.setStore_id(storeId);
+        couponCodeVerificationDto.setMemberId(userId);
         // 订单号 替换成唯一序号
         couponCodeVerificationDto.setTrans_id(orderId);
         couponCodeVerificationDto.setBusiness_date(DateUtil.convert2Str(new Date(), DateUtil.FORMAT_yyyyMMdd));

order-application-service/src/main/java/cn/freemud/entities/dto/CouponCodeVerificationDto.java

@@ -21,6 +21,7 @@ public class CouponCodeVerificationDto extends CouponCodeBaseDto {
     private String trans_id;
     private String business_date;
     private String channel;
+    private String memberId;
 
     private List<CouponCodeVerificationTransDto> transactions;
 

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

@@ -2530,6 +2530,7 @@ public class OrderServiceImpl implements Orderservice {
             /**
              *  - 老的svc卡或是0元订单下单成功直接核销 这里不处理
              *  - 混合支付纯svc支付 需要直接内部核销 其他支付方式需依靠外部回调
+             *  -
              */
             PaysuccessNoticeMessage message = new PaysuccessNoticeMessage();
             message.setResult_code(100);
@@ -2539,10 +2540,12 @@ public class OrderServiceImpl implements Orderservice {
             message.setOpenid(createPrepayRequestDto.getOpenId());
             message.setPlatform_coupon(0);
             message.setMerchant_coupon(0);
-            message.setSource(PaySuccessSource.INSIDE.getSource());
+            message.setSource(PaySuccessSource.OUTSIDE.getSource());
+            /*
             if (StringUtils.isNotBlank(orderPayResponse.getPayMode()) && PayChannelType.SVC.getEbcode().equals(orderPayResponse.getPayMode())) {
                 message.setSource(PaySuccessSource.OUTSIDE.getSource());
             }
+             */
             orderAdapterService.paySuccessCallback(message);
             return ResponseUtil.success(createOrderResponse);
         }