Merge branch 'feature/2020-1104-混合支付' into qa

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

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

@@ -614,12 +614,27 @@ public class OrderAdapter {
         createOrderDto.setLongitude(longitude);
         createOrderDto.setOrderType(convent2OrderTypeEnum(orderType));
         createOrderDto.setPayType(QueryPayType.ONLINE_PAY);
+        //电子风味卡
         if (Objects.nonNull(createOrderVo.getUnionPayCard())) {
-            createOrderDto.setPayChannel(PayChannel.USVCP.getCode());
-            createOrderDto.setPayChannelName(PayChannel.USVCP.getDesc());
-        } else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
-            createOrderDto.setPayChannel("10102");
-            createOrderDto.setPayChannelName("储值卡支付");
+            createOrderDto.setPayChannel(PayChannelType.USVCP.getEbcode());
+            createOrderDto.setPayChannelName(PayChannelType.USVCP.getName());
+        }
+        //混合支付
+        else if (PayChannelType.COMB.getIndex().equals(createOrderVo.getPayChannelType())) {
+            createOrderDto.setPayChannel(PayChannelType.COMB.getEbcode());
+            createOrderDto.setPayChannelName(PayChannelType.COMB.getName());
+        }
+        else if (PayChannelType.WECHAT.getIndex().equals(createOrderVo.getPayChannelType())) {
+            createOrderDto.setPayChannel(PayChannelType.WECHAT.getEbcode());
+            createOrderDto.setPayChannelName(PayChannelType.WECHAT.getName());
+        }
+        else if (PayChannelType.ALIPAY.getIndex().equals(createOrderVo.getPayChannelType())) {
+            createOrderDto.setPayChannel(PayChannelType.ALIPAY.getEbcode());
+            createOrderDto.setPayChannelName(PayChannelType.ALIPAY.getName());
+        }
+        else if(StringUtils.isNotBlank(createOrderVo.getCardCode())){
+            createOrderDto.setPayChannel(PayChannelType.SVC.getEbcode());
+            createOrderDto.setPayChannelName(PayChannelType.SVC.getName());
         }
         createOrderDto.setSource(OrderSourceType.SAAS.getCode());
         createOrderDto.setSourceName(OrderSourceType.SAAS.getDesc());

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

@@ -54,12 +54,14 @@ import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
+import lombok.extern.log4j.Log4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import sun.rmi.runtime.Log;
 
 import java.awt.geom.Point2D;
 import java.math.BigDecimal;
@@ -69,6 +71,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Component
+@Log4j
 public class CheckOrder {
 
     // 配送费逻辑是否使用旧的
@@ -748,10 +751,13 @@ public class CheckOrder {
         if (StringUtils.isBlank(createOrderVo.getCardCode())) {
             return false;
         }
+        //这么不合规的粗暴搞法 设置支付方式
+        PayChannelType payType = PayChannelType.getByIndex(Byte.parseByte(createOrderVo.getChannel()));
+        createOrderVo.setPayChannelType(payType.getIndex());
+
         SVCCardAmountRequest request = new SVCCardAmountRequest();
         request.setPartnerId(createOrderVo.getPartnerId());
         request.setCardCodes(Arrays.asList(createOrderVo.getCardCode()));
-
         BaseResponse<SVCCardAmountResponse> svcCardAmount = paymentNewService.querySVCCardAmount(request, trackingNo);
         if (svcCardAmount==null || svcCardAmount.getData()==null ||!ResponseResult.SUCCESS.getCode().equals(svcCardAmount.getCode())) {
             throw new ServiceException(ResponseResult.USER_SVC_CARD_ERROR);

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

@@ -2445,6 +2445,31 @@ public class OrderServiceImpl implements Orderservice {
         return ResponseUtil.error(ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getCode(), ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getMessage(), null);
     }
 
+    /**
+     * 混合预支付
+     * @param trackingNo
+     * @param orderBean
+     * @param cardCode
+     * @param orderClient
+     * @param msg
+     * @return
+     */
+    private BaseResponse failCombPreOrderPay(String trackingNo, QueryOrdersResponse.DataBean.OrderBean orderBean, String cardCode, OrderClientType orderClient, String msg) {
+        List<OrderClientType> notCancelOrderClientList = Lists.newArrayList(OrderClientType.APP);
+        if(!notCancelOrderClientList.contains(orderClient)) {
+            //失败冲正库存，冲正活动库存，取消订单
+            CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
+                    AfterSalesType.SYSTEM_CANCEL, StringUtils.join(new String[]{"获取预支付失败", msg}, '-'), trackingNo, null);
+            orderCenterSdkService.orderCancel(cancelOrderRequest);
+            // TODO: 2019/9/10 hubowen mq推送变更
+            backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
+        }
+        //svc 卡支付失败
+        //if (StringUtils.isNotBlank(cardCode)) {
+        //    return ResponseUtil.error(ResponseResultEnum.PAY_BACKEND_CONFIG_ERROR.getCode(), ResponseResultEnum.PAY_BACKEND_CONFIG_ERROR.getMessage(), null);
+        //}
+        return ResponseUtil.error(ResponseResultEnum.PAY_UNIFIED_ORDER_ERROR.getCode(),"获取混合预支付信息失败", null);
+    }
     public OrderPayResponse getPreOrderPay(QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo, Integer cardAmount, String transId, String partnerPayOvertime, OrderExtInfoDto orderExtInfoDto) {
         try {
             UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, partnerPayOvertime);
@@ -2472,6 +2497,7 @@ public class OrderServiceImpl implements Orderservice {
 
     public OrderPayResponse svcPay(String cardCode, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String transId, String trackingNo) {
         CodePayRequest request = new CodePayRequest();
+        OrderPayResponse orderPayResponse = new OrderPayResponse();
         String partnerId = orderBean.getCompanyId();
         request.setBody(orderBean.getShopName());
         request.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
@@ -2487,22 +2513,25 @@ public class OrderServiceImpl implements Orderservice {
         svcRequest.setPartnerId(partnerId);
         svcRequest.setCardCodes(Arrays.asList(cardCode));
         //查询svc卡余额
+        log.info("svc支付:{}",transId);
         com.freemud.application.sdk.api.base.BaseResponse<SVCCardAmountResponse> svcCardAmountResponseBaseResponse = paymentNewService.querySVCCardAmount(svcRequest, trackingNo);
         if (svcCardAmountResponseBaseResponse == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(svcCardAmountResponseBaseResponse.getCode())
                 || svcCardAmountResponseBaseResponse.getData().getData() == null || CollectionUtils.isEmpty(svcCardAmountResponseBaseResponse.getData().getData().getCardSimpleInfos())) {
-            return null;
+            orderPayResponse.setMsg(Objects.isNull(svcCardAmountResponseBaseResponse) ? "获取svc卡余额异常" : svcCardAmountResponseBaseResponse.getMessage());
+            return orderPayResponse;
         }
         Integer amount = svcCardAmountResponseBaseResponse.getData().getData().getCardSimpleInfos().get(0).getAmount();
         Integer vamount = svcCardAmountResponseBaseResponse.getData().getData().getCardSimpleInfos().get(0).getVamount();
         if (amount + vamount < orderBean.getAmount()) {
-            return null;
+            orderPayResponse.setMsg("svc卡余额不足");
+            return orderPayResponse;
         }
         //svc卡支付
         com.freemud.application.sdk.api.base.BaseResponse<CodePayResponse> responseBase = paymentNewService.codePay(request, trackingNo);
         if (responseBase == null || !ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode()) || responseBase.getData().getData() == null) {
-            return null;
-        }
-        OrderPayResponse orderPayResponse = new OrderPayResponse();
+            // 1.9.34 预支付失败需要把原因进行记录
+            orderPayResponse.setMsg(Objects.isNull(responseBase) ? "svc卡支付异常" : responseBase.getMessage());
+        } else {
             CodePayResponse.CodePayDate codePayResponse = responseBase.getData().getData();
             orderPayResponse.setFmId(codePayResponse.getFmId());
             orderPayResponse.setPayTransId(codePayResponse.getPayTransId());
@@ -2510,6 +2539,7 @@ public class OrderServiceImpl implements Orderservice {
             orderPayResponse.setOpenId(paymentRequest.getOpenId());
             orderPayResponse.setPartnerId(orderBean.getCompanyId());
             orderPayResponse.setOrderId(orderBean.getOid());
+        }
         return orderPayResponse;
     }
 
@@ -3175,7 +3205,8 @@ public class OrderServiceImpl implements Orderservice {
         orderPayResponse = comPayOrder(paymentRequest,createPrepayRequestDto,partnerPayOvertime,LogThreadLocal.getTrackingNo());
 
         if (orderPayResponse == null || Objects.isNull(orderPayResponse.getFmId())) {
-            return failPreOrderPay(LogThreadLocal.getTrackingNo()
+            log.info("混合支付返回:{}",JSON.toJSONString(orderPayResponse));
+            return failCombPreOrderPay(LogThreadLocal.getTrackingNo()
                     , createPrepayRequestDto.getProductOrderBean()
                     , cardCode
                     , createPrepayRequestDto.getOrderClient()
@@ -3229,6 +3260,7 @@ public class OrderServiceImpl implements Orderservice {
         CombPayResponse responseBase      = null;
         CombPayRequest combPayRequest      = null;
         CombPayResponse.PayPlatform payPlatform = null;
+        log.info("混合支付...");
         try {
             String orderClient = this.getPayCodeByChanel(createPrepayRequestDto);
             if (StringUtils.isBlank(orderClient)) {
@@ -3244,6 +3276,7 @@ public class OrderServiceImpl implements Orderservice {
                 orderPayResponse.setMsg(responseBase.getMsg());
             }
             else {
+                log.info("混合支付请求request:{},response:{}",JSON.toJSONString(combPayRequest),JSON.toJSONString(responseBase));
                 /**
                  * 生成预支付参数
                  */
@@ -3275,6 +3308,7 @@ public class OrderServiceImpl implements Orderservice {
             }
         }
         catch (Exception e) {
+            log.info("混合支付异常...");
             //TODO 邮件告警
             LogUtil.error("comPay_error", JSONObject.toJSONString(responseBase), JSONObject.toJSONString(paymentRequest), e);
             orderPayResponse = new OrderPayResponse();