Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒'

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

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

@@ -618,6 +618,7 @@ public class OrderSdkAdapter {
                 orderClients.add(OrderClientType.APP.getIndex());
             }
         }
+        orderClients.add(OrderClientType.TIKTOKPAY.getIndex());
         orderClients.add(OrderClientType.ALIPAY.getIndex());
         orderConditionsReq.setOrderClients(orderClients);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java

@@ -41,6 +41,7 @@ public enum OrderSourceType {
     DPZHCT("dpzhct", "美团点评智慧餐厅", 24),
     FMWD("fmwd", "非码微店", 25),
     Y_POS("ypos", "非码云POS", 26),
+    TIKTOKPAY("tiktokpay","抖音支付", 27),
     parkingmanual("parkingmanual", "农工商停车手工录单", 98),
     PARKING("parking", "农工商停车", 99),
     SDG("sdg", "闪电购", 1000);

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

@@ -73,6 +73,16 @@ public class OrderPayResponse {
     // 支付类型：机场支付=20099
     private String ebCode;
 
+    /**
+     * 抖音支付的返回的为orderId 映射为我们thirdOrderId
+     */
+    private String thirdOrderId;
+
+    /**
+     * 抖音支付的orderToken 映射为我们thirdOrderToken
+     */
+    private String thirdOrderToken;
+
     @NoArgsConstructor
     @Data
     public static class PayOrderBean {

order-application-service/pom.xml

@@ -320,7 +320,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.3.RELEASE</version>
+            <version>2.6.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

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

@@ -25,6 +25,7 @@ import cn.freemud.entities.dto.promotion.OrderBeanRequest;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
 import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
+import cn.freemud.entities.ttpay.OrderInfo;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
 import cn.freemud.entities.vo.encircle.PreviewOrderInfoVo;
@@ -2838,6 +2839,10 @@ public class OrderAdapter {
         }
         orderPayDto.setProducts(productBeans);
         orderPayDto.setPayCode(paymentRequest.getPayCode());
+        //抖音支付的payCode = 10066
+        if(OrderClientType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())){
+            orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
+        }
         orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
         return orderPayDto;
     }
@@ -2900,6 +2905,14 @@ public class OrderAdapter {
             createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getType(), orderBean.getGmtExpect()));
         }
         createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder());
+        //抖音支付添加返回OrderInfo
+        if(String.valueOf(PayChannelType.TIKTOKPAY.getIndex()).equals(orderBean.getPayChannelType())) {
+            OrderInfo orderInfo = new OrderInfo();
+            orderInfo.setOrder_id(orderPayResponse.getThirdOrderId());
+            orderInfo.setOrder_token(orderPayResponse.getThirdOrderToken());
+            createOrderResponseVo.setOrderInfo(orderInfo);
+        }
+
         return createOrderResponseVo;
     }
 
@@ -2951,6 +2964,8 @@ public class OrderAdapter {
         }
         responseDto.setStatusCode(unifiedOrderResponse.getStatusCode());
         responseDto.setPayTransId(unifiedOrderResponse.getPayTransId());
+        responseDto.setThirdOrderToken(unifiedOrderResponse.getOrderToken());
+        responseDto.setThirdOrderId(unifiedOrderResponse.getOrderId());
         return responseDto;
     }
 

order-application-service/src/main/java/cn/freemud/entities/ttpay/OrderInfo.java

+package cn.freemud.entities.ttpay;
+
+import lombok.Data;
+
+@Data
+public class OrderInfo {
+    private String order_id;
+    /**
+     * 抖音支付的orderToken 映射为我们order_token
+     */
+    private String order_token;
+}

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

@@ -12,6 +12,7 @@
  */
 package cn.freemud.entities.vo;
 
+import cn.freemud.entities.ttpay.OrderInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -62,4 +63,9 @@ public class CreateOrderResponseVo {
     @ApiModelProperty(value = "支付宝参数 唤起支付宝支付使用")
     private String orderStr;
 
+    /**
+     * 抖音支付返回数据
+     */
+    private OrderInfo orderInfo;
+
 }

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

@@ -59,4 +59,10 @@ public class SellCouponCreateOrderVo {
 //    @NotEmpty(message = "version 版本号不能为空")
     private String version;
 
+
+    /**
+     * 渠道 1 saas 2 img 爱马哥  默认saas 3. iwc i围餐
+     */
+    private String channel;
+
 }

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

@@ -2481,6 +2481,11 @@ public class OrderServiceImpl implements Orderservice {
         } else if (UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())) {
             orderClient = OrderClientType.APP;
         }
+        //抖音小程序
+        if("5".equalsIgnoreCase(createOrderVo.getChannel())) {
+            createOrderVo.setPayChannelType(PayChannelType.TIKTOKPAY.getIndex());
+            orderClient = OrderClientType.TIKTOKPAY;
+        }
         long totalAmount = 0;
         int cardAmount = 0;
         QueryOrdersResponse.DataBean.OrderBean fatherBeanListOne = new QueryOrdersResponse.DataBean.OrderBean();
@@ -2776,6 +2781,11 @@ public class OrderServiceImpl implements Orderservice {
                 if (orderPayResponse.getPayOrder() != null && StringUtils.isNotBlank(orderPayResponse.getPayOrder().getAliPayOrder())) {
                     orderPayResponse.setPayMode(PayChannelType.ALIPAY.getEbcode());
                 }
+                //抖音支付
+                if(PayChannelType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getPayChannelType())){
+                    orderPayResponse.setPayMode(PayChannelType.TIKTOKPAY.getEbcode());
+                }
+
             }
         } catch (Exception e) {
             LogUtil.error("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest));

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

@@ -37,6 +37,7 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
+import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
 import com.freemud.application.sdk.api.ordercenter.request.OrderChangeStateReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.create.*;
@@ -409,6 +410,11 @@ public class SellCouponOrderServiceImpl {
         if(UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())){
             orderClient = OrderClientType.APP.getIndex();
         }
+        //抖音小程序
+        if("5".equalsIgnoreCase(requestVo.getChannel())) {
+            request.setPayChannel(PayChannelType.TIKTOKPAY.getIndex().toString());
+            orderClient = OrderClientType.TIKTOKPAY.getIndex();
+        }
         String partnerId = userLoginInfoDto.getPartnerId();
         request.setOrderClient(orderClient);
         request.setPartnerId(partnerId);
@@ -493,6 +499,10 @@ public class SellCouponOrderServiceImpl {
         request.setOrderExtended(orderAdapter.saveStoreInfo(storeInfo));
         request.setOperator(userLoginInfoDto.getNickName());
         request.setAppId(userLoginInfoDto.getWxAppId());
+        if("5".equalsIgnoreCase(requestVo.getChannel().toString())){
+            request.setPayChannelType(PayChannelType.TIKTOKPAY.getIndex());
+        }
+        request.setPayChannel(requestVo.getChannel());
         return request;
 
     }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderClientType.java

@@ -35,6 +35,7 @@ public enum OrderClientType {
     KOUBEI(22, "口碑"),
     SAASMALL(23, "微商城"),
     FMWD(25, "非码微店"),
+    TIKTOKPAY(27, "抖音小程序"),
     PARKING(99 , "农工商停车"),
     ;
 

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayChannelType.java

@@ -12,7 +12,8 @@ public enum PayChannelType {
     SVC((byte)3,"10102","储值卡"),
     COMB((byte)4,"10212","混合支付"),
     USVCP((byte)5,"10556", "电子风味卡支付"),
-    ZERO((byte)6,"100000", "0元支付");
+    ZERO((byte)6,"100000", "0元支付"),
+    TIKTOKPAY((byte)7,"10066", "抖音支付");
 
     private Byte index;
     private String ebcode;