混合支付Beta

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.0.16-RELEASE</version>
+    <version>2.2.21106-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.18.RELEASE</version>
+            <version>1.3.2001.SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.16-RELEASE</version>
+            <version>2.2.21106-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -3,9 +3,13 @@ package cn.freemud.entities.dto.order;
 import cn.freemud.entities.vo.CreateOrderVo;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 @Data
 public class CreatePrepayRequestDto {
     /**
@@ -67,4 +71,15 @@ public class CreatePrepayRequestDto {
      * 使用电子风味卡
      */
     private CreateOrderVo.UnionPayCard unionPayCard;
+
+    private List<OrderPayItemCreateReq> orderPayItemCreateReqList;
+    /**
+     * svc支付金额
+     */
+    private BigDecimal svcAmount;
+    /**
+     * 现金支付金额
+     */
+    private BigDecimal cashAmount;
+    private String storeId;
 }

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

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: OrderPayResponseDto
+ * @Package cn.freemud.entities.dto
+ * @Description:
+ * @author: liming.guo
+ * @date: 2018/5/25 17:10
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package cn.freemud.entities.dto.pay;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+@ToString
+public class CombPayResponse {
+    private int code;
+
+    @ApiModelProperty(value = "提示信息")
+    private String msg;
+    private PayPlatforms data;
+
+    @Data
+    public static class PayPlatforms {
+        private List<PayPlatform> payPlatformResponseList;
+    }
+    @Data
+    static public class PayPlatform {
+
+        @ApiModelProperty(value = "app_id编号(微信使用)")
+        private String appId;
+
+        @ApiModelProperty(value = "支付渠道编号")
+        private String ebCode;
+
+        //@ApiModelProperty(value = "验签可配置")
+        private String sign;
+
+        @ApiModelProperty(value = "非码交易流水号")
+        private String fmTradeNo;
+
+        @ApiModelProperty(value = "随机字符串(微信使用)")
+        private String nonceStr;
+
+        @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;
+    }
+}

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.18.RELEASE</version>
+    <version>1.3.2001.SNAPSHOT</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>