Merge branch 'develop' of…

Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

assortment-ordercenter-sdk/readme.md

@@ -34,3 +34,6 @@
 | 1.4.5-SNAPSHOT | 订单app渠道 | 丁凯 | 2020-04-16 |
 | 1.4.7-SNAPSHOT | 去掉无用字符写入ext_info | 李小二 | 2020-04-17 |
 | 1.4.8-SNAPSHOT | 增加实际配送费 | 海波 | 2020-04-17 |
+| 1.3.1.RELEASE | queryOrderById返回新增商家、平台优惠 | 侯书虎 | 2020-04-20 |
+| 1.3.2.RELEASE | ext_info 增加stapleFood主食设置 | 李小二 | 2020-04-20 |
+| 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 |

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

@@ -1744,6 +1744,9 @@ public class OrderSdkAdapter {
             case 2:
                 newOrderAccountType = OldOrderAccountType.BUY_DISCOUNT.getCode();
                 break;
+            case 3:
+                newOrderAccountType = OldOrderAccountType.PRICE_DEDUCTION_COUPON.getCode();
+                break;
             case 10:
                 newOrderAccountType = OldOrderAccountType.COUPON.getCode();
                 break;

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

@@ -36,6 +36,7 @@ public enum OldOrderAccountType {
     XY_DISCOUNT(104, "x件y折", "XY_DISCOUNT"),
     FULL_DISTRIBUTION_FEE(1014, "满减配送费", "FULL_DISTRIBUTION_FEE"),
     NEW_USER_DISCOUNT(101, "新用户立减", "NEW_USER_DISCOUNT"),
+    PRICE_DEDUCTION_COUPON(103, "抵价券", "PRICE_DEDUCTION_COUPON"),
     TOTAL_DISCOUNT(205, "优惠总金额", "TOTAL_DISCOUNT");
     private Integer code;
 

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -230,4 +230,14 @@ public class OrderController {
         return orderAdapterService.createPrepay(request);
     }
 
+    /**
+     * mock支付回调
+     * 此方法不发布到生产环境，只在测试做联调测试
+     */
+    @ApiAnnotation(logMessage = "mockPayCallback")
+    @PostMapping("/mockPayCallback")
+    public String mockPayCallback(@LogParams @RequestBody NewPaysuccessNoticeMessage message) {
+        return orderservice.newPaySuccessCallback(message);
+    }
+
 }

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

@@ -173,17 +173,6 @@ public class CreateOrderVo {
     private String cardCode;
 
     /**
-     * 渠道类型 OrderChannelType
-     */
-    private String channelType;
-
-    /**
-     * 微信配送地址信息
-     */
-    private WeixinDeliveryAddressDto weixinDeliveryAddress;
-
-
-    /**
      * 扫脸支付使用
      */
     private String faceCode;
@@ -193,6 +182,15 @@ public class CreateOrderVo {
 
     @Builder.Default
     private String menuType = "saas";
+    /**
+     * 渠道类型 OrderChannelType
+     */
+    private String channelType;
+
+    /**
+     * 微信配送地址信息
+     */
+    private WeixinDeliveryAddressDto weixinDeliveryAddress;
 
     @Data
     public static class PremiumExchangeActivity {

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

@@ -12,6 +12,7 @@
  */
 package cn.freemud.entities.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
@@ -22,46 +23,55 @@ public class NewPaysuccessNoticeMessage {
     /**
      * 总金额
      */
+    @ApiModelProperty(value = "总金额")
     private Integer totalAmount;
 
     /**
      * 商家优惠金额
      */
+    @ApiModelProperty(value = "商家优惠金额")
     private Integer merchantCoupon;
 
     /**
      * 平台优惠金额
      */
+    @ApiModelProperty(value = "平台优惠金额")
     private Integer platformCoupon;
 
     /**
      * （ 非码交易流水号 fmID）
      */
+    @ApiModelProperty(value = "非码交易流水号 fmID")
     private String transactionCode;
 
     /**
      * 渠道方流水号 （比如扫呗，易宝等）
      */
+    @ApiModelProperty(value = "渠道方流水号 （比如扫呗，易宝等）")
     private String endTransId;
 
     /**
      * 第三方交易流水 （微信单号）
      */
+    @ApiModelProperty(value = "第三方交易流水 （微信单号）")
     private String thirdPartTradeNo;
 
     /**
      * 支付商户号
      */
+    @ApiModelProperty(value = "支付商户号")
     private String platformMchId;
 
     /**
      * 非码商户号
      */
+    @ApiModelProperty(value = "非码商户号")
     private String partnerId;
 
     /**
      * 扫呗终端号
      */
+    @ApiModelProperty(value = "扫呗终端号")
     private String appId;
 
     /**
@@ -76,14 +86,18 @@ public class NewPaysuccessNoticeMessage {
     /**
      * 支付时终端交易序号
      */
+    @ApiModelProperty(value = "支付时终端交易序号，订单号")
     private String transId;
+    @ApiModelProperty(value = "用户openId")
     private String openId;
     /**
      * 会员规则ID
      */
+    @ApiModelProperty(value = "会员规则ID")
     private String ruleId;
     /**
      * 100 是成功
      */
+    @ApiModelProperty(value = "支付返回码，100是成功")
     private String resultCode;
 }