Merge branch 'feature/1.9.21-mockpaysuccess-20190422dingkai' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml

assortment-ordercenter-sdk/readme.md

@@ -25,4 +25,7 @@
 | 1.2.7.RELEASE | 判断优化 | 丁凯 | 2020-04-03 |
 | 1.2.8.RELEASE | 增加延时队列 | 海波 | 2020-04-13 |
 | 1.2.9.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
-| 1.3.0.RELEASE | app订单 | 丁凯 | 2020-04-20 |
\ No newline at end of file
+| 1.3.0.RELEASE | app订单 | 丁凯 | 2020-04-20 |
+| 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 |
\ No newline at end of file

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

@@ -613,6 +613,8 @@ public class OrderSdkAdapter {
                 accountBean.setSequence(orderSettlementResp.getProductSeq());
                 accountBean.setType(getOldOrderAccountType(orderSettlementResp.getSettlementType()));
                 accountBean.setAddInfo("");
+                accountBean.setPlatformDiscountAmount(orderSettlementResp.getPlatformDiscountAmount());
+                accountBean.setShopDiscountAmount(orderSettlementResp.getShopDiscountAmount());
                 accountList.add(accountBean);
             }
         }

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

@@ -572,6 +572,11 @@ public class QueryOrdersResponse {
                  * 自定义对象
                  */
                 private String addInfo;
+                //平台优惠
+                private Long platformDiscountAmount;
+
+                //商家优惠
+                private Long shopDiscountAmount;
             }
 
             @NoArgsConstructor

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

@@ -228,4 +228,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

@@ -15,6 +15,7 @@ package cn.freemud.entities.vo;
 import cn.freemud.entities.dto.UserDeliveryInfoDto;
 import io.swagger.annotations.ApiModelProperty;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
+import lombok.Builder;
 import lombok.Data;
 
 import javax.validation.Valid;
@@ -179,7 +180,8 @@ public class CreateOrderVo {
     @ApiModelProperty(hidden = true)
     private String sessionKey; // 存储sessionKey,异常补退使用
 
-    private String menuType;
+    @Builder.Default
+    private String menuType = "saas";
     /**
      * 渠道类型 OrderChannelType 
      */

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;
 }

order-management/pom.xml

@@ -46,7 +46,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.2.9.RELEASE</version>
+            <version>1.3.1.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>