Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -262,6 +262,10 @@ public class OrderSdkAdapter {
             request.setExtInfo(JSONObject.toJSONString(requestVO.getOtherInfo()));
         }
 
+        //订单重量
+        Double orderWeight = sumOrderWeight(requestVO.getProducts());
+        request.setWeight(orderWeight);
+        request.setOrderPayItemCreateReqList(requestVO.getOrderPayItemCreateReqList());
         return request;
     }
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -2,6 +2,7 @@ package com.freemud.sdk.api.assortment.order.request.order;
 
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq;
 import com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest;
 import com.freemud.sdk.api.assortment.order.config.BaseConfig;
@@ -207,5 +208,6 @@ public class BaseCreateOrderRequest extends BaseConfig {
          */
         private String ruleId;
     }
+    private List<OrderPayItemCreateReq> orderPayItemCreateReqList;
 
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/PayPlatformVO.java

+package com.freemud.sdk.api.assortment.order.request.payment;
+
+import lombok.Data;
+
+@Data
+public class PayPlatformVO {
+    private String ebcode;
+    private Long amount;
+
+}

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/ProductVO.java

+package com.freemud.sdk.api.assortment.order.request.payment;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ProductVO {
+
+    private String id;
+    private BigDecimal quantity;
+    private Integer seq;
+    private Long price;
+    private String name;
+    private String salesType = "NORMAL";
+}

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/UnifiedOrderApplicationRequest.java

+package com.freemud.sdk.api.assortment.order.request.payment;
+
+import com.freemud.application.sdk.api.log.ApiAnnotation;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UnifiedOrderApplicationRequest {
+    private List<PayPlatformVO> platforms;
+    private String openId;
+    private String notifyUrl;
+    private Integer invoiceFlag;
+    private Long amount;
+    private Long vipAmount;
+    private Long undisAmount;
+    private String body;
+    private String outOrderNo;
+    private List<ProductVO> products;
+    private String goodsTag;
+    private String partnerId;
+    private String storeId;
+    private String businessDate;
+    private String stationId = "1";
+    private String operatorId = "1";
+    private String transId;
+    private String foodOrderType;
+    private String appId;
+    private String payCode;
+    private String payTimeOutTime;
+    private String ebCode;
+
+}

order-application-service/src/main/java/cn/freemud/entities/dto/UnifiedOrderApiResponse.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;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@NoArgsConstructor
+@Data
+@ToString
+public class UnifiedOrderApiResponse {
+    private int code;
+    @ApiModelProperty(value = "提示信息")
+    private String message;
+
+    @ApiModelProperty(value = "验签可配置")
+    private String sign;
+
+    @ApiModelProperty(value = "支付帐号")
+    private String payAccount;
+
+    @ApiModelProperty(value = "支付渠道编号")
+    private String ebCode;
+
+    @ApiModelProperty(value = "支付渠道描述")
+    private String platformDesc;
+
+    @ApiModelProperty(value = "第三方支付交易序号")
+    private String platformTradeNo;
+
+    @ApiModelProperty(value = "非码交易流水号")
+    private String fmTradeNo;
+
+    @ApiModelProperty(value = "外部交易流水号，由上游系统生成，需保证唯一")
+    private String outOrderNo;
+
+    @ApiModelProperty(value = "app_id编号(微信使用)")
+    private String appId;
+
+    @ApiModelProperty(value = "商户号(微信使用)")
+    private String mchId;
+
+    @ApiModelProperty(value = "包名(微信使用)")
+    private String _package;
+
+    @ApiModelProperty(value = "随机字符串(微信使用)")
+    private String nonceStr;
+
+    @ApiModelProperty(value = "签名(微信使用)")
+    private String paySign;
+
+    @ApiModelProperty(value = "签名类型(微信使用)")
+    private String paySignType;
+
+    @ApiModelProperty(value = "时间戳(微信使用)")
+    private String timestamp;
+
+    @ApiModelProperty(value = "预订单编号")
+    private String prepayId;
+
+    @ApiModelProperty(value = "biz_content(支付宝使用)")
+    private String bizContent;
+
+    @ApiModelProperty(value = "当前预下单请求生成的二维码码串")
+    private String codeUrl;
+
+    @ApiModelProperty(value = "间联单号")
+    private String endTransTradeNo;
+}

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

@@ -3,9 +3,12 @@ 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.util.List;
+
 @Data
 public class CreatePrepayRequestDto {
     /**
@@ -67,4 +70,6 @@ public class CreatePrepayRequestDto {
      * 使用电子风味卡
      */
     private CreateOrderVo.UnionPayCard unionPayCard;
+
+    private List<OrderPayItemCreateReq> orderPayItemCreateReqList;
 }

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

@@ -14,6 +14,7 @@ package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.UserDeliveryInfoDto;
 import io.swagger.annotations.ApiModel;
+import com.freemud.application.sdk.api.ordercenter.request.create.OrderPayItemCreateReq;
 import io.swagger.annotations.ApiModelProperty;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
 import lombok.Builder;
@@ -23,12 +24,15 @@ import org.hibernate.validator.constraints.NotEmpty;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.util.ArrayList;
 import java.util.List;
 
 
 @Data
 public class CreateOrderVo {
 
+    private List<OrderPayItemCreateReq> orderPayItemCreateReqList;
+
     @NotEmpty(message = "sessionId 不能为空")
     private String sessionId;
 
@@ -327,5 +331,6 @@ public class CreateOrderVo {
          * 规则ID
          */
         private String ruleId;
+
     }
 }

order-application-service/src/main/java/cn/freemud/enums/PayChannel.java

@@ -20,7 +20,8 @@ public enum PayChannel {
      */
     USVCP("10556", "电子风味卡支付"),
     ALIPAY("10300", "支付宝"),
-    WXPAY("10211", "微信");
+    WXPAY("10211", "微信"),
+    COMPAY("10212", "组合支付");
 
     private String code;
     private String desc;

order-application-service/src/main/java/cn/freemud/enums/PayChannelType.java

+package cn.freemud.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum PayChannelType {
+
+    WECHAT((byte)1,"微信"),
+    SVC((byte)2,"储值卡"),
+    ALIPAY((byte)3,"支付宝"),
+    COMB((byte)4,"混合支付");
+
+    private Byte index;
+    private String name;
+
+    public static final String API_DESC = "订单支付渠道类型 1:微信 2:储值卡 3:支付宝 4:混合支付";
+
+    public static PayChannelType getByIndex(byte index) {
+        for (PayChannelType payType : values()) {
+            if (payType.getIndex().equals(index)) {
+                return payType;
+            }
+        }
+        return null;
+    }
+}

order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentApplicationClient.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: PaymentClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description: 支付服务
+ * @author: liming.guo
+ * @date: 2018/5/12519:24
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.dto.*;
+import com.freemud.sdk.api.assortment.order.request.payment.UnifiedOrderApplicationRequest;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.web.bind.annotation.*;
+
+
+@FeignClient(name = "payment-center-application-api",url="${saas.paymentcenter.application.api.feign.url}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface PaymentApplicationClient {
+
+    /**
+     * 统一下单
+     */
+    @PostMapping("/payment/application/unifiedOrder")
+    UnifiedOrderApiResponse unifiedOrder(@RequestBody UnifiedOrderApplicationRequest unifiedOrderApplicationRequest, @RequestHeader("partnerId") String partnerId);
+
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java

@@ -215,4 +215,5 @@ public class CreateOrderRequest extends BaseRequest {
 
     private Byte payChannelType;
 
+    private List<OrderPayItemCreateReq> orderPayItemCreateReqList;
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderPayItemCreateReq.java

+package com.freemud.application.sdk.api.ordercenter.request.create;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class OrderPayItemCreateReq {
+    private Long id;
+
+    private Long orderId;
+
+    private String orderCode;
+
+    private String partnerId;
+
+    private String storeId;
+
+    private String payChannelType;
+
+    private String payChannelName;
+
+    private String operator;
+
+    private BigDecimal payAmount;
+}
\ No newline at end of file