Merge remote-tracking branch 'remotes/origin/feature_20200514_1.9.23_payGift'

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

@@ -94,6 +94,8 @@ public class OrderAdapter {
     private static String SERIALNO = "3425DD6C131D637D7316076C4A44E1CBEFE3DB55";
     private static String privatekey = "MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDO+3Q6YX6843Qo5Okhum74yG7zpJ8NbWk9EugJwxW9AZuZI3fziAW5+EblEkx0ZeXYX/GvztjRUZ+MA4eHAXnAdzhiTO46LOePtjQXXqPVOHKEhkfa/5qvJSzJ1Ei8ICrA1hQOGF0sqxMmFNpWaXJkHZ7rJ4KRir8osVeWEF8l8xWEktpXVzspT1PGt7T9i9cQO/lMFYP9nq4qr0pZ4rGgpjURjuZHam5E9l6IFP0VVBvyYP96c/9rUgDeLtPqRDCfQC3WYUtA34XudM/HaGCSPvg5ui5Q2sWob10YFP2F8iTCBHDE3rR1s+inYjS4oXd/TCWQ7+C/O7L9h5AKEFAZAgMBAAECggEAGNFJpF5gReG34ddgpKyn9aiCtS/96iw+PBZyQAlmJ91zfK8mCMs8dInyZjEFfcdiAcmvPvc8RAzXZoBd1bA1mwAwgIjc35jWwwKDyHGOj1hPUtiO8RFIyMtaTXDor7Xjqm+AxBfjxCFXEG/bphTKpHpwvZ1lKHJMbWKmL9YSsof1zK12FC5nFxA0mrPlpYHWFmbeMLu7ngDTGEA5AepKv+BZcqMEJGQvAgskGHdsLSd2NoadUQoFz0ZOrXAXlqNQpODUqRTm3besq2ClBaa2JNEG/KxGqZGM11jsTaduH5WhUubb53OJ8pbkw3ROept9fW25QX/k3ORJ3Xmq+g4gAQKBgQDqbRE1mrfEYW0yjnb6FKx+0jHcU/RNuqflCCoWaEzzNJbMzTxuYvyyR7bhT07B26Qji2ic3T/qUokMXpavadZItH8QegTf3eCtDWU1a6RdPkS+NvRT3NaJstbPnGEEavcbS4y45phE9637rhn7WpaWCmw4ggaawNH/lo7kOBCqGQKBgQDiB9PpW7gumtFlNqw6HVcdl/1SvIOWPujvzYNnFkp3ZWDf/hF7XWno3+w27kA/ox9X7A7ejZZgPsR1+QVgbAGCRDs7qVM77r0XddXtKatCnENWsIER11+SAHwXNI+OzVJyivxqc8MqKVt/TdIIRlOXmrDtBLWXrKtJ6+fpRZ2WAQKBgG1T2EbLlRB871Q4pLwUkC3FEYPTk4f8mPhzSk2Q7vItgHaa8Kf6eica0utY9T3rlS0OgwdFF93MCCZApr2/+jOGGgwxG7zb2UBbkuvK+6iQtbaQInpJ77PgN9Yy8/v/dqbAISzKPhFMAVPy6iMTKE9pJPdljHb3nfg42wMMMplhAoGAYV2r3F9FNNY+E1J82D/hUf8yAZzxNhx9bSdjTlnc1BfYpkSktTalM8qZz4PMK12SV+Z49UeamnUPXh5aQZHlCH9p4KZtE2khDWUWNSZ4/qWfoE1CHDRhl9wbmEds+7/YnzzdxOF/Fb9hCbK1IhlhUvIw+rjHnMGlu58idGsnmgECgYAk+2mWAoGUaQdgPHc0Ts8AiZ1CB2HcWEakFD4yYfVYL107OkxfSXd7dlaVklCHbHaMUYuT4euIfJzXfaTjEnImqQu2hs9u1yTyJHKwjj9gyWHYfcr4byiXjKnbwMkNCrrHWMXCKZ3/F0FQWRE9lsIHZYkFUUUoZYmSorbBf815HQ==";
 
+    public static final String PAY_CODE_10102 = "10102"; // svc储值卡支付，可用于判断订单是否用储值卡支付
+
     @Value("${saas.reverseNotifyiDcUrl}")
     private String reverseNotifyiDcUrl;
     @Value("${saas.refund.notify.callback}")
@@ -945,6 +947,7 @@ public class OrderAdapter {
                     .map(PayStatus::getDesc).orElse(""));
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
+            responseVo.setPayChannel(ordersBean.getPayChannel());
             if(ordersBean.getPayChannel() != null && "10102".equals(ordersBean.getPayChannel()) ){
                 responseVo.setOrderPayType("储值卡支付");
             }else {
@@ -2895,4 +2898,12 @@ public class OrderAdapter {
         return orderClientType;
     }
 
+    /**
+     * 是否储值卡支付
+     * true-是
+     */
+    public static boolean isPayOfSVC(String payChannel) {
+        return StringUtils.isNotBlank(payChannel) && OrderAdapter.PAY_CODE_10102.equalsIgnoreCase(payChannel);
+    }
+
 }

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -13,7 +13,8 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.PromotionMessageDto;
-import cn.freemud.entities.dto.order.OrderAccountDto;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Builder;
 import lombok.Data;
 
@@ -174,6 +175,13 @@ public class QueryOrderResponseVo {
      * 付款方式  微信支付
      */
     private String orderPayType;
+
+    /**
+     * 支付渠道
+     */
+    @JsonIgnore
+    @JSONField(serialize = false)
+    private String payChannel;
     /**
      * 付款单号
      */

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

@@ -786,7 +786,13 @@ public class OrderServiceImpl implements Orderservice {
         payGitRequestDto.setSessionId(sessionId);
         payGitRequestDto.setOid(queryOrderResponseVo.getOid());
         payGitRequestDto.setPayAmount(queryOrderResponseVo.getAmount());
-        payGitRequestDto.setPayType(1);//1-微信,2-储值卡
+
+        // 通知支付有礼发放奖励：区分是否是储值卡支付
+        if (OrderAdapter.isPayOfSVC(queryOrderResponseVo.getPayChannel())) {
+            payGitRequestDto.setPayType(2);
+        } else {
+            payGitRequestDto.setPayType(1);//1-微信,2-储值卡
+        }
         if(CollectionUtils.isNotEmpty(queryOrderResponseVo.getProducts())){
             payGitRequestDto.setSkuIds(queryOrderResponseVo.getProducts().stream().map(p -> p.getPid()).collect(Collectors.toList()));
         }