fix:调整支付返回参数

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java

@@ -83,10 +83,16 @@ public class OrderPayResponse {
 
         private String nonceStr;
 
+        /**
+         * 签名
+         */
         private String sign;
 
         private String timestamp;
 
+        /**
+         * 签名方式
+         */
         private String signType;
 
         private String aliPayOrder;

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

@@ -3598,12 +3598,12 @@ public class OrderAdapter {
         responseDto.setFmId(payPlatform.getFmTradeNo());
         CombPayResponse.PayPlatform.PayOrderBean payOrderBean = payPlatform.getPayOrder();
         if (null != payOrderBean) {
-            payBean.setAppid(payOrderBean.getAppid());
+            payBean.setAppid(payOrderBean.getAppId());
             payBean.setNonceStr(payOrderBean.getNonceStr());
             payBean.setPackageX(payOrderBean.getPackageX());
-            payBean.setSign(payOrderBean.getSign());
+            payBean.setSign(payOrderBean.getPaySign());
             payBean.setSignType(payOrderBean.getSignType());
-            payBean.setTimestamp(payOrderBean.getTimestamp());
+            payBean.setTimestamp(payOrderBean.getTimeStamp());
             payBean.setAliPayOrder(payOrderBean.getAliPayOrder());
             responseDto.setPayOrder(payBean);
         }

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

@@ -42,9 +42,6 @@ public class CombPayResponse {
         @ApiModelProperty(value = "支付渠道编号")
         private String ebCode;
 
-        //@ApiModelProperty(value = "验签可配置")
-        private String sign;
-
         @ApiModelProperty(value = "非码交易流水号")
         private String fmTradeNo;
 
@@ -54,31 +51,12 @@ public class CombPayResponse {
         @ApiModelProperty(value = "外部交易流水号，由上游系统生成，需保证唯一")
         private String outOrderNo;
 
-        @ApiModelProperty(value = "包名(微信使用)")
-        @JsonProperty("package")
-        private String _package;
-
         @ApiModelProperty(value = "支付帐号")
         private String payAccount;
 
-        @ApiModelProperty(value = "签名(微信使用)")
-        private String paySign;
-
-        @ApiModelProperty(value = "签名类型(微信使用)")
-        private String paySignType;
-
-        @ApiModelProperty(value = "支付渠道描述")
-        private String platformDesc;
-
         @ApiModelProperty(value = "第三方支付交易序号")
         private String platformTradeNo;
 
-        @ApiModelProperty(value = "预订单编号")
-        private String prepayId;
-
-        @ApiModelProperty(value = "时间戳(微信使用)")
-        private String timestamp;
-
         @ApiModelProperty(value = "间联单号")
         private String transId;
         @ApiModelProperty(value = "")
@@ -93,18 +71,22 @@ public class CombPayResponse {
              * timestamp : 1527230190
              * signType : MD5
              */
-            private String appid;
+            private String appId;
 
             @JsonProperty("package")
             private String packageX;
 
             //@JsonProperty("nonce_str")
             private String nonceStr;
+            /**
+             * 支付签名
+             */
+            private String paySign;
 
-            private String sign;
-
-            private String timestamp;
-
+            private String timeStamp;
+            /**
+             * 加密方式
+             */
             private String signType;
             private String aliPayOrder;
         }