Merge branch '20200827-1000' of gitlab.freemud.com:order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/BaseRequest.java

@@ -31,8 +31,8 @@ public class BaseRequest {
     /***
      * posid
      */
-    @NotEmpty(message = "posId不能为空")
-    private String posId;
+    @NotEmpty(message = "posCode不能为空")
+    private String posCode;
 
     @NotEmpty(message = "商户id不能为空")
     //商户号

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/CompleteRequest.java

@@ -29,8 +29,8 @@ public class CompleteRequest {
     /***
      * posid
      */
-    @NotEmpty(message = "posId不能为空")
-    private String posId;
+    @NotEmpty(message = "posCode不能为空")
+    private String posCode;
 
     @NotEmpty(message = "门店id不能为空")
     private String storeId;

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/CreateOrderRequest.java

@@ -78,6 +78,7 @@ public class CreateOrderRequest {
 
     //订单类型 店内自取实时-1常规堂食 店内自取预约-2预约堂食 店外快递实时-3常规外卖，
     // 店外快递预约-4预约外卖 店外自取实时-5常规自取 店外自取预约-6预约自取
+    //   富有 1:堂食，3：外卖， 7，收银机,8 三方小程序,9 团购
     private Integer orderType;
 
     //正常情况下不要设置值，此字段仅在做订单同步时使用
@@ -207,6 +208,7 @@ public class CreateOrderRequest {
     //订单商品信息
     List<OrderItemCreateReq> orderItemList;
 
+
     //订单费用信息
     List<OrderCostCreateReq> orderCostDetailList;
 

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/PayQueryRequest.java

@@ -26,8 +26,8 @@ public class PayQueryRequest {
         /***
          * posid
          */
-        @NotEmpty(message = "posId不能为空")
-        private String posId;
+        @NotEmpty(message = "posCode不能为空")
+        private String posCode;
 
         @NotEmpty(message = "商户id不能为空")
         //商户号

order-application-service/src/main/java/cn/freemud/fuyou/controller/request/RefundRequest.java

@@ -32,8 +32,8 @@ public class RefundRequest {
     /***
      * posid
      */
-    @NotEmpty(message = "posId不能为空")
-    private String posId;
+    @NotEmpty(message = "posCode不能为空")
+    private String posCode;
 
     @NotEmpty(message = "用户id不能为空")
     private String storeId;

order-application-service/src/main/java/cn/freemud/fuyou/service/PaymentService.java

@@ -103,7 +103,7 @@ public class PaymentService {
         channelRequest.setStoreId(request.getStoreId());
         channelRequest.setTransId(order.getOrderCode());
         channelRequest.setFrontTransId(order.getOrderCode());
-        channelRequest.setStationId(request.getPosId());
+        channelRequest.setStationId(request.getPosCode());
         com.freemud.application.sdk.api.base.BaseResponse<PaymentQueryOrderResponse> query = paymentNewService.queryOrder(channelRequest, LogThreadLocal.getTrackingNo());
         baseResponse.setCode(query.getCode());
         baseResponse.setMessage(query.getMessage());

order-application-service/src/main/java/cn/freemud/fuyou/service/processor/CouponEventProcessor.java

@@ -55,7 +55,7 @@ public class CouponEventProcessor extends AbstractProcessor {
         couponCodeVerificationDto.setPartnerId(Integer.parseInt(orderInfoReqs.getPartnerId()));
         //自取：pickup，外送：delivery，麦咖啡微信小程序：mocoffee_wx，麦咖啡支付宝小程序：mocoffee_zfb
         couponCodeVerificationDto.setChannel("pickup");
-        couponCodeVerificationDto.setStation_id(request.getPosId());
+        couponCodeVerificationDto.setStation_id(request.getPosCode());
         couponCodeVerificationDto.setOperator_id("-1");
         couponCodeVerificationDto.setStore_id(orderInfoReqs.getStoreId());
         //核销不需要核销通知