订单区分渠道

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/request/XiaoJuQueryNewOrderModel.java

@@ -2,10 +2,12 @@ package com.zswl.cloud.springBatch.client.model.request;
 
 import com.xiaoju.open.oil.interfaces.domain.AllowanceInfo;
 import com.xiaoju.open.oil.interfaces.domain.ItemPriceInfoForCallback;
+import com.zhongshu.payment.client.type.Channel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
@@ -27,4 +29,6 @@ public class XiaoJuQueryNewOrderModel {
     private String openExtra;
     private String outNewUserFlag;
     private List<AllowanceInfo> promotionInfo;
+    @NotNull
+    private Channel channel;
 }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/OrderController.java

@@ -64,7 +64,7 @@ public class OrderController {
         CreateOrder2Model createOrder2Model = new CreateOrder2Model();
         createOrder2Model.setUserId(userId);
         createOrder2Model.setShopId(orderParamModel.getShopId());
-
+        createOrder2Model.setChannel(orderParamModel.getChannel());
 
         // 店铺详情
         com.zswl.cloud.shop.client.ret.ResultContent<ShopDetailVo> detail1 = shopService.detail(createOrder2Model.getShopId());

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/XiaoJuController.java

@@ -19,6 +19,7 @@ import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @Log4j2
@@ -77,7 +78,7 @@ public class XiaoJuController {
     @ApiOperation("创建订单")
     @RequestMapping(value = "queryNewOrder", method = RequestMethod.POST)
     @ResourceAuth(value = "user", type = AuthType.User)
-    public ResultContent<QueryNewOrderResponse> queryNewOrder(@RequestBody XiaoJuQueryNewOrderModel xiaoJuQueryNewOrderModel) {
+    public ResultContent<QueryNewOrderResponse> queryNewOrder(@RequestBody @Valid XiaoJuQueryNewOrderModel xiaoJuQueryNewOrderModel) {
         return xiaoJuService.queryNewOrder(xiaoJuQueryNewOrderModel);
     }
 
@@ -85,14 +86,15 @@ public class XiaoJuController {
     @RequestMapping(value = "cancelOrder", method = RequestMethod.POST)
     @ResourceAuth(value = "user", type = AuthType.User)
     public ResultContent cancelOrder(@RequestBody QueryNewOrderResponse queryNewOrderResponse) {
-       return xiaoJuService.cancelOrder(queryNewOrderResponse);
+        return xiaoJuService.cancelOrder(queryNewOrderResponse);
     }
+
     @ApiOperation("查询订单列表")
     @RequestMapping(value = "queryOrderList", method = RequestMethod.POST)
     @ResourceAuth(value = "user", type = AuthType.User)
     public ResultContent queryOrderList(@RequestBody QueryApiOrderListRequest queryApiOrderListRequest) {
         QueryApiOrderListResponse queryApiOrderListResponse = xiaoJuService.queryOrderList(queryApiOrderListRequest);
-        return ResultContent.build(ResultState.Success,queryApiOrderListResponse);
+        return ResultContent.build(ResultState.Success, queryApiOrderListResponse);
     }
 
     @ApiOperation("下单前查询最优可用券")

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/XiaoJuService.java

@@ -454,6 +454,7 @@ public class XiaoJuService {
             shop.setValue(BigDecimal.valueOf(100));
             goods.setTransferRrule(List.of(shop));
             createOrder2Model.setGoodsList(List.of(goods));
+            createOrder2Model.setChannel(xiaoJuQueryNewOrderModel.getChannel());
 
             ResultContent<CreatOrderResultModel> creat = orderService2.creat(createOrder2Model);
             if (!creat.getState().equals(ResultState.Success)){