Merge branch 'refs/heads/Data-Isolation'

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Hotel/request/AddOrderRequest.java

@@ -1,13 +1,11 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Hotel.request;
 
-import com.zhongshu.payment.client.type.Channel;
 import com.zswl.cloud.springBatch.client.model.dfy.DfyBaseData;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -16,7 +14,7 @@ import java.util.List;
 public class AddOrderRequest extends DfyBaseData {
 
     @NotNull
-    private Channel channel;
+    private String code;
     private String sourceOrderId; // 分销商订单号
     private String acctId; // 账号Id
     @NotNull

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/dfy/Ticket/request/CreateOrderNewRequest.java

@@ -1,7 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.dfy.Ticket.request;
 
 
-import com.zhongshu.payment.client.type.Channel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -21,7 +20,7 @@ public class CreateOrderNewRequest {
 
     @ApiModelProperty(required = true)
     @NotNull
-    private Channel channel;
+    private String code;
     // 分销商订单号，非空时，可防止重复下单。若重复下单，则返回之前已生成的orderId，且isNewFlag=0。
     @ApiModelProperty(hidden = true)
     private String sourceOrderId;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/qiuxiang/OrderRequest.java

@@ -1,5 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.qiuxiang;
 
+import com.zhongshu.payment.client.model.Code;
 import com.zhongshu.payment.client.type.Channel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -10,9 +11,7 @@ import javax.validation.constraints.NotNull;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class OrderRequest {
-    @NotNull
-    private Channel channel;
+public class OrderRequest extends Code {
     private String adcode;
     private String originName;
     private String originLocation;

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/recharge/RechargeCreateModel.java

@@ -1,6 +1,7 @@
 package com.zswl.cloud.springBatch.client.model.recharge;
 
 import cn.hutool.json.JSONObject;
+import com.zhongshu.payment.client.model.Code;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,7 +11,7 @@ import java.math.BigDecimal;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class RechargeCreateModel {
+public class RechargeCreateModel extends Code {
     String sign;
     String phone;
     String shopName;

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

@@ -2,6 +2,7 @@ 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.model.Code;
 import com.zhongshu.payment.client.type.Channel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,7 +14,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class XiaoJuQueryNewOrderModel {
+public class XiaoJuQueryNewOrderModel extends Code {
 
     @NotNull
     private String epId;
@@ -32,6 +33,4 @@ public class XiaoJuQueryNewOrderModel {
     private String openExtra;
     private String outNewUserFlag;
     private List<AllowanceInfo> promotionInfo;
-    @NotNull
-    private Channel channel;
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/video2/RechargeRequest.java

@@ -1,5 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.video2;
 
+import com.zhongshu.payment.client.model.Code;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -10,7 +11,7 @@ import javax.validation.constraints.NotNull;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class RechargeRequest {
+public class RechargeRequest extends Code {
 
     @NotNull
     @ApiModelProperty(value = "商品编码", required = true)
@@ -33,4 +34,5 @@ public class RechargeRequest {
     @NotNull
     @ApiModelProperty(value = "用户ID", required = true)
     private String userId;
+
 }

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/kfc/request/CreateOrdereRquest.java

@@ -1,5 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.ypp.kfc.request;
 
+import com.zhongshu.payment.client.model.Code;
 import com.zhongshu.payment.client.type.Channel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -14,9 +15,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class CreateOrdereRquest {
-
-    private Channel channel;
+public class CreateOrdereRquest extends Code {
 
     private String shopName;
 

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/movie/request/CreateOrder2Request.java

@@ -1,5 +1,6 @@
 package com.zswl.cloud.springBatch.client.model.ypp.movie.request;
 
+import com.zhongshu.payment.client.model.Code;
 import com.zhongshu.payment.client.type.Channel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -13,9 +14,8 @@ import java.time.OffsetDateTime;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class CreateOrder2Request {
+public class CreateOrder2Request extends Code {
 
-    private Channel channel;
     /**
      * 有票票分配的appId
      */

SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/service/Video2Service.java

@@ -2,21 +2,13 @@ package com.zswl.cloud.springBatch.client.service;
 
 
 import com.github.microservice.auth.client.content.ResultContent;
-import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
-import com.zswl.cloud.springBatch.client.model.request.XiaoJuQueryUserPromotionListModel;
 import com.zswl.cloud.springBatch.client.model.video2.RechargeRequest;
-import com.zswl.cloud.springBatch.client.model.xiaoju.QueryApiStorePriceRequest;
-import com.zswl.cloud.springBatch.client.model.xiaoju.QueryGetPromotionRequest;
-import com.zswl.cloud.springBatch.client.model.xiaoju.QueryUserPromotionListResponse;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Map;
 
 @FeignClient(name = "springbatchservice/manager/video2")
 public interface Video2Service {

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

@@ -4,6 +4,7 @@ import cn.hutool.json.JSONObject;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.payment.client.aop.Code;
 import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
 import com.zswl.cloud.springBatch.client.model.ypp.kfc.request.CreateOrdereRquest;
 import com.zswl.cloud.springBatch.client.model.ypp.kfc.response.CityListResponse;
@@ -63,6 +64,7 @@ public class KfcController {
     }
 
     @ApiOperation("下单(自己做产品展示，才需要下单接口)")
+    @Code
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "createOrder", method = RequestMethod.POST)
     public ResultContent<CreatOrderResultModel> createOrder(@RequestBody CreateOrdereRquest createOrdereRquest) {

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

@@ -5,10 +5,10 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.client.content.ResultContent;
-import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.payment.client.aop.Code;
 import com.zhongshu.payment.client.model.CountModel;
 import com.zhongshu.payment.client.model.order.*;
 import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
@@ -58,6 +58,7 @@ public class OrderController {
     @ApiOperation("创建订单")
     @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
     @RequestMapping(value = "creat", method = RequestMethod.POST)
+    @Code
     public synchronized ResultContent creat(@RequestBody @Valid AddOrderParamModel orderParamModel) {
         String userId = authHelper.getCurrentUser().getUserId();
 
@@ -65,7 +66,7 @@ public class OrderController {
         CreateOrder2Model createOrder2Model = new CreateOrder2Model();
         createOrder2Model.setUserId(userId);
         createOrder2Model.setShopId(orderParamModel.getShopId());
-        createOrder2Model.setChannel(orderParamModel.getChannel());
+        createOrder2Model.setCode(orderParamModel.getCode());
         createOrder2Model.setDiscountList(orderParamModel.getDiscountId());
 
         // 店铺详情
@@ -157,6 +158,7 @@ public class OrderController {
         createOrder2Model.setTotalAmount(scanModel.getPrice());
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
         createOrder2Model.setPayAmount(scanModel.getPrice());
+        createOrder2Model.setCode(scanModel.getCode());
 
 
         // 商品信息
@@ -206,6 +208,7 @@ public class OrderController {
     @ApiOperation("app_订单查询列表")
     @RequestMapping(value = "user/search", method = RequestMethod.POST)
     @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
+    @Code
     public ResultContent<Page<OrderResult2Model>> userSearch(@RequestBody @Valid UserSeachOrderModel userSeachOrderModel) {
 
         return orderServiceImp.userSearch(userSeachOrderModel);
@@ -236,6 +239,7 @@ public class OrderController {
     @RequestMapping(value = "shop/search", method = RequestMethod.POST)
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
     @ResourceAuth(value = "admin", type = AuthType.Project)
+    @Code
     public ResultContent<Page<OrderResult2Model>> shopSearch(@RequestBody AdminSeachOrderModel seachOrderModel) {
         return orderServiceImp.shopSearch(seachOrderModel);
     }
@@ -245,6 +249,7 @@ public class OrderController {
     @RequestMapping(value = "shop/wechat/search", method = RequestMethod.POST)
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
     @ResourceAuth(value = "admin", type = AuthType.Project)
+    @Code
     public ResultContent<Page<OrderResult2Model>> shopWechatSearch(@RequestBody AdminSeachOrderModel seachOrderModel) {
         return orderServiceImp.adminWeChatSearch(seachOrderModel);
     }
@@ -263,6 +268,7 @@ public class OrderController {
     @ApiOperation("平台_订单查询列表")
     @RequestMapping(value = "platform/search", method = RequestMethod.POST)
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
+    @Code
     public ResultContent<Page<OrderResult2Model>> platformSearch(@RequestBody AdminSeachOrderModel seachOrderModel) {
 
         return orderServiceImp.adminSearch(seachOrderModel);
@@ -281,6 +287,7 @@ public class OrderController {
     @ApiOperation("平台_统计")
     @RequestMapping(value = "platform/count", method = RequestMethod.POST)
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
+    @Code
     public ResultContent count(@RequestBody @Valid CountModel countModel) {
         return orderServiceImp.count(countModel);
     }

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

@@ -6,6 +6,7 @@ import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.payment.client.aop.Code;
 import com.zhongshu.payment.client.model.AccountCountRequestModel;
 import com.zhongshu.payment.client.model.TransferDetailRequestModel;
 import com.zhongshu.payment.client.model.WithdrawListModel;
@@ -16,7 +17,7 @@ import com.zhongshu.payment.client.model.payment.CloseResponsetModel;
 import com.zhongshu.payment.client.model.payment.CreateResponseModel;
 import com.zhongshu.payment.client.model.payment.QueryRequestModel;
 import com.zhongshu.payment.client.model.payment.withdrawals.zhongshu.SyncWithdrawals;
-import com.zhongshu.payment.client.model.payment.zswl.ApplyWithdrawalsModel;
+import com.zhongshu.payment.client.model.payment.zswl.AccountModel;
 import com.zhongshu.payment.client.model.payment.zswl.AuditWithdrawalsModel;
 import com.zhongshu.payment.client.model.payment.zswl.CreatePaymentModel;
 import com.zhongshu.payment.client.model.payment.zswl.SyncInformModel;
@@ -115,6 +116,7 @@ public class PaymentController {
     }
 
     @ApiOperation("平台收入明细获取分账信息")
+    @Code
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
     @ResourceAuth(value = "admin", type = AuthType.Project)
@@ -134,26 +136,29 @@ public class PaymentController {
     }
 
     @ApiOperation("平台查询 额度信息")
+    @Code
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @PostMapping(value = "account/platformDetail")
-    public ResultContent platformDetail(@RequestBody ChannelModel channel) {
-        return paymentServer.platformDetail(channel.getChannel());
+    public ResultContent platformDetail(@RequestBody com.zhongshu.payment.client.model.Code code) {
+        return paymentServer.platformDetail(code);
     }
 
 
     @ApiOperation("店铺_提现按钮")
+    @Code
     @ResourceAuth(value = "admin", type = AuthType.Enterprise)
     @ResourceAuth(value = "admin", type = AuthType.Project)
     @RequestMapping(value = "account/withdrawals", method = RequestMethod.POST)
-    public ResultContent withdrawals(@RequestBody ApplyWithdrawalsModel applyWithdrawalsModel) {
+    public ResultContent withdrawals(@RequestBody AccountModel applyWithdrawalsModel) {
         return paymentServer.applicationShopWithdrawals(applyWithdrawalsModel);
     }
 
     @ApiOperation("平台_提现按钮")
+    @Code
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @RequestMapping(value = "account/withdrawalsPlatform", method = RequestMethod.POST)
-    public ResultContent withdrawalsPlatformApplication(@RequestBody ChannelModel channel) {
-        return paymentServer.withdrawalsPlatformApplication(channel.getChannel());
+    public ResultContent withdrawalsPlatformApplication(@RequestBody com.zhongshu.payment.client.model.Code code) {
+        return paymentServer.withdrawalsPlatformApplication(code);
     }
 
     @ApiOperation("店铺_提现订单列表")
@@ -166,6 +171,7 @@ public class PaymentController {
     }
 
     @ApiOperation("平台_提现订单列表")
+    @Code
     @ResourceAuth(value = AuthConstant.SuperAdmin, type = AuthType.Platform)
     @RequestMapping(value = "account/withdrawals/platform/list", method = RequestMethod.POST)
     public ResultContent withdrawalsPlatformList(@RequestBody @Valid WithdrawRequestModel withdrawRequestModel) {

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

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONObject;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.payment.client.aop.Code;
 import com.zswl.cloud.springBatch.client.model.qiuxiang.OrderRequest;
 import com.zswl.cloud.springBatch.client.service.QiuXiangService;
 import com.zswl.cloud.springBtach.server.core.api.qiuxiang.QiuXiangApi;
@@ -28,6 +29,7 @@ public class QiuXiangController {
     QiuXiangService qiuXiangService;
 
     @ApiOperation("下单")
+    @Code
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "addOrder", method = RequestMethod.POST)
     public ResultContent placeOrder(@RequestBody OrderRequest orderRequest) {

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

@@ -1,6 +1,7 @@
 package com.zswl.cloud.springBtach.server.core.controller;
 
 import com.github.microservice.auth.client.content.ResultContent;
+import com.zhongshu.payment.client.aop.Code;
 import com.zswl.cloud.springBatch.client.model.recharge.RechargeCreateModel;
 import com.zswl.cloud.springBtach.server.core.service.impl.RechargeServiceImpl;
 import lombok.extern.log4j.Log4j2;
@@ -19,6 +20,7 @@ public class RechargeController {
     @Autowired
     RechargeServiceImpl rechargeService;
 
+    @Code
     @RequestMapping(value = "pay", method = RequestMethod.POST)
     public ResultContent recharge(@RequestBody RechargeCreateModel rechargeCreateModel) {
         return rechargeService.recharge(rechargeCreateModel)                ;

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

@@ -10,6 +10,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.helper.AuthHelper;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.core.util.bean.BeanUtil;
+import com.zhongshu.payment.client.aop.Code;
 import com.zhongshu.payment.client.model.CountModel;
 import com.zhongshu.payment.client.model.order.*;
 import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
@@ -58,6 +59,7 @@ public class StudyOrderController {
 
     @SneakyThrows
     @ApiOperation("创建订单")
+    @Code
     @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
     @RequestMapping(value = "creat", method = RequestMethod.POST)
     public synchronized ResultContent creat(@RequestBody @Valid AddStudyOrderParamModel param) {

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

@@ -6,7 +6,9 @@ import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.payment.client.aop.Code;
 import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
+import com.zswl.cloud.springBatch.client.model.video2.RechargeRequest;
 import com.zswl.cloud.springBtach.server.core.service.impl.Video2ServiceImpl;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
@@ -33,9 +35,10 @@ public class Video2Controller {
     }
 
     @ApiOperation("创建视频会员订单")
+    @Code
     @ResourceAuth(value = AuthConstant.User, type = AuthType.User)
     @RequestMapping(value = "creatOrder", method = RequestMethod.POST)
-    ResultContent<CreatOrderResultModel> rechargeProduct(@RequestBody RechargeOrderReq rechargeOrderReq) {
+    ResultContent<CreatOrderResultModel> rechargeProduct(@RequestBody RechargeRequest rechargeOrderReq) {
         return video2Service.creatOrder(rechargeOrderReq);
     }
 }

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

@@ -13,6 +13,7 @@ import com.xiaoju.open.oil.interfaces.domain.StorePriceInfo;
 import com.xiaoju.open.oil.interfaces.request.QueryApiOrderListRequest;
 import com.xiaoju.open.oil.interfaces.request.QueryGetPromotionRequest;
 import com.xiaoju.open.oil.interfaces.response.*;
+import com.zhongshu.payment.client.aop.Code;
 import com.zswl.cloud.springBatch.client.model.request.*;
 import com.zswl.cloud.springBatch.client.model.xiaoju.ActivityModel;
 import com.zswl.cloud.springBatch.client.model.xiaoju.QueryApiStorePriceRequest;
@@ -89,6 +90,7 @@ public class XiaoJuController {
     @ApiOperation("创建订单")
     @RequestMapping(value = "queryNewOrder", method = RequestMethod.POST)
     @ResourceAuth(value = "user", type = AuthType.User)
+    @Code
     public ResultContent<QueryNewOrderResponse> queryNewOrder(@RequestBody @Valid XiaoJuQueryNewOrderModel xiaoJuQueryNewOrderModel) {
         return xiaoJuService.queryNewOrder(xiaoJuQueryNewOrderModel);
     }

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

@@ -3,6 +3,7 @@ package com.zswl.cloud.springBtach.server.core.controller;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.payment.client.aop.Code;
 import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
 import com.zswl.cloud.springBatch.client.model.ypp.movie.request.CreateOrder2Request;
 import com.zswl.cloud.springBtach.server.core.api.ypp.KfcApi;
@@ -30,6 +31,7 @@ public class YppController {
     @ApiOperation("创建订单")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "create_order", method = RequestMethod.POST)
+    @Code
     public ResultContent<CreatOrderResultModel> create_order(@RequestBody CreateOrder2Request createOrdereRquest) {
         return yppService.create_order(createOrdereRquest);
     }

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/standard/StandarOrderJob.java

@@ -81,7 +81,7 @@ public class StandarOrderJob {
                     for (CreateOrder2Model.Goods goods : createOrder2Model.getGoodsList()) {
 
                         // 商品详情
-                        com.zswl.cloud.shop.client.ret.ResultContent<GoodsInfoVo> detail = goodsService.detail(goods.getGoodsId(), 1, createOrder2Model.getUserId());
+                        com.zswl.cloud.shop.client.ret.ResultContent<GoodsInfoVo> detail = goodsService.detail(goods.getGoodsId(), 1, createOrder2Model.getUserId(), createOrder2Model.getCode());
                         log.info("商品详情：{}", JSONUtil.toJsonStr(detail));
                         GoodsInfoVo goodsInfoVo = detail.getContent();
                         SharePlatformVo sharePlatformVo = goodsInfoVo.getSharePlatformVo();

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/ypp/YppDeliveryJob.java

@@ -10,7 +10,6 @@ import com.zhongshu.payment.client.model.payment.SubOrdersConfirmResponseModel;
 import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.service.v2.PaymentService2;
 import com.zhongshu.payment.client.type.OrderType;
-import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.springBatch.client.model.ypp.movie.response.CreateOrder2Response;
 import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
 import com.zswl.cloud.springBtach.server.core.helper.RedisHelper;
@@ -35,8 +34,6 @@ public class YppDeliveryJob {
     @Autowired
     OrderService2 orderService2;
 
-    @Autowired
-    ShopService shopService;
 
     @Autowired
     AuthHelper authHelper;
@@ -54,7 +51,6 @@ public class YppDeliveryJob {
     @Delegate
     StandarDeliveryJob standarDeliveryJob;
 
-
     public Step yppDeliveryStep() {
         return getStepBuilderFactory().get("yppDeliveryStep")
                 .tasklet((contribution, chunkContext) -> {

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

@@ -124,23 +124,29 @@ public class PaymentService {
     }
 
     public ResultContent getDetail() {
-        return paymentService2.getDetail(authHelper.getEnterPriseId());
+        AccountModel accountModel = new AccountModel();
+        accountModel.setPlatform(false);
+        accountModel.setShopId(authHelper.getEnterPriseId());
+
+        return paymentService2.getDetail(accountModel);
     }
 
-    public ResultContent platformDetail(Channel channel) {
-        return paymentService2.getDetail(channel.name());
+    public ResultContent platformDetail(Code code) {
+        AccountModel accountModel = new AccountModel();
+        accountModel.setPlatform(true);
+        accountModel.setCode(code.getCode());
+        return paymentService2.getDetail(accountModel);
     }
 
-    public ResultContent applicationShopWithdrawals(ApplyWithdrawalsModel applyWithdrawalsModel) {
+    public ResultContent applicationShopWithdrawals(AccountModel applyWithdrawalsModel) {
         applyWithdrawalsModel.setShopId(authHelper.getEnterPriseId());
         applyWithdrawalsModel.setPlatform(false);
         return paymentService2.applicationWithdrawals(applyWithdrawalsModel);
     }
 
-    public ResultContent withdrawalsPlatformApplication(Channel channel) {
-        ApplyWithdrawalsModel applyWithdrawalsModel = new ApplyWithdrawalsModel();
-        applyWithdrawalsModel.setShopId(channel.name());
-        applyWithdrawalsModel.setChannel(channel);
+    public ResultContent withdrawalsPlatformApplication(Code code) {
+        AccountModel applyWithdrawalsModel = new AccountModel();
+        applyWithdrawalsModel.setCode(code.getCode());
         applyWithdrawalsModel.setPlatform(true);
         return paymentService2.applicationWithdrawals(applyWithdrawalsModel);
     }
@@ -152,7 +158,6 @@ public class PaymentService {
     }
 
     public ResultContent withdrawalsPlatformList(WithdrawRequestModel withdrawRequestModel) {
-        withdrawRequestModel.setShopId(withdrawRequestModel.getChannel().name());
 
         return paymentService2.withdrawalsOrderList(withdrawRequestModel);
     }

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

@@ -100,7 +100,7 @@ public class YppService {
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
         createOrder2Model.setPayAmount(totalUserPrice);
         createOrder2Model.setAccesserUserId(authAccount);
-        createOrder2Model.setChannel(createOrder2Request.getChannel());
+        createOrder2Model.setCode(createOrder2Request.getCode());
 
 
         JSONObject goodsInfo = JSONUtil.parseObj(createOrder2Request);

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

@@ -156,7 +156,7 @@ public class DfyHotelServiceImpl implements DfyHotelService {
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
         createOrder2Model.setPayAmount(totalPrice);
         createOrder2Model.setAccesserUserId(authAccount);
-        createOrder2Model.setChannel(addOrderRequest.getChannel());
+        createOrder2Model.setCode(addOrderRequest.getCode());
         JSONObject goodsInfo = JSONUtil.parseObj(addOrderRequest);
         goodsInfo.set("hotelInfo", orderDetailResponse.getData().getHotelInfo());
         goodsInfo.set("channelOrderId", String.valueOf(addOrderResponse.getData().getOrderId()));
@@ -214,10 +214,7 @@ public class DfyHotelServiceImpl implements DfyHotelService {
                 case "已取消":
                     switch (goodsResultModel.getGoodsState()) {
                         case WAIT_PAYMENT:
-                            UpdateOrder2Model updateOrder2Model = new UpdateOrder2Model();
-                            updateOrder2Model.setOrderType(OrderType.CLOSE);
-                            updateOrder2Model.setOrderNo(goodsResultModel.getOrderNo());
-                            orderService2.updateOrderType(updateOrder2Model);
+                            paymentService2.close(goodsResultModel.getOrderNo(), goodsResultModel.getUserId());
                             break;
                         case WAIT_USE:
                             ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();

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

@@ -17,7 +17,6 @@ import com.zhongshu.payment.client.type.TransferType;
 import com.zswl.cloud.shop.client.dto.life.TripartiteShopDto;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.AccountDetailVo;
-import com.zswl.cloud.shop.client.vo.life.ShopDetailVo;
 import com.zswl.cloud.shop.client.vo.life.ShopInfoSimpleVo;
 import com.zswl.cloud.springBatch.client.model.dfy.Ticket.request.*;
 import com.zswl.cloud.springBatch.client.model.dfy.Ticket.response.*;
@@ -149,7 +148,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
         createOrder2Model.setPayAmount(payAmount);
         createOrder2Model.setAccesserUserId(authAccount);
-        createOrder2Model.setChannel(createOrderNewRequest.getChannel());
+        createOrder2Model.setCode(createOrderNewRequest.getCode());
         JSONObject goodsInfo = JSONUtil.parseObj(createOrderNewRequest2);
         goodsInfo.set("channelOrderId", String.valueOf(createOrderNewResponse.getData().getOrderId()));
         goodsInfo.set("goodsName", detailResponse.getData().getProductName());
@@ -226,10 +225,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
                 case "已取消":
                     switch (goodsResultModel.getGoodsState()) {
                         case WAIT_PAYMENT:
-                            UpdateOrder2Model updateOrder2Model = new UpdateOrder2Model();
-                            updateOrder2Model.setOrderType(OrderType.CLOSE);
-                            updateOrder2Model.setOrderNo(goodsResultModel.getOrderNo());
-                            orderService2.updateOrderType(updateOrder2Model);
+                            paymentService2.close(goodsResultModel.getOrderNo(),goodsResultModel.getUserId());
                             break;
                         case WAIT_USE:
                             ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();

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

@@ -118,7 +118,7 @@ public class KfcServiceImpl {
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
         createOrder2Model.setPayAmount(bigDecimal);
         createOrder2Model.setAccesserUserId(authAccount);
-        createOrder2Model.setChannel(kfcGoodsDetailRequest.getChannel());
+        createOrder2Model.setCode(kfcGoodsDetailRequest.getCode());
 
 
         JSONObject goodsInfo = JSONUtil.parseObj(kfcGoodsDetailRequest);
@@ -134,6 +134,8 @@ public class KfcServiceImpl {
         goods.setPayAmount(bigDecimal);
         goods.setValidDay(90);
         goods.setTransferType(sharePlatformVo.getShareType().equals(1) ? TransferType.RATIO : TransferType.FIXED);
+        goods.setGoodsName(kfcGoodsDetailRequest.getGoodsName());
+        goods.setImageUrl(kfcGoodsDetailRequest.getImageCnUrl());
 
         List<CreateOrder2Model.Owner> ownerList = new ArrayList<>();
 

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

@@ -67,7 +67,7 @@ public class QiuXiangServiceImpl implements QiuXiangService {
         JSONObject entries1 = JSONUtil.parseObj(content);
         entries1.set("shopName", "秋香代驾");
         CreateOrder2Model createOrder2Model = new CreateOrder2Model();
-        createOrder2Model.setChannel(orderRequest.getChannel());
+        createOrder2Model.setCode(orderRequest.getCode());
         createOrder2Model.setUserId(authHelper.getCurrentUser().getUserId());
         createOrder2Model.setShopId(content.getAccountId());
         createOrder2Model.setShopInfo(entries1);

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

@@ -101,7 +101,7 @@ public class RechargeServiceImpl {
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
         createOrder2Model.setPayAmount(totalAmount);
         createOrder2Model.setAccesserUserId(authAccount);
-        createOrder2Model.setChannel(Channel.GuiDa);
+        createOrder2Model.setCode(rechargeCreateModel.getCode());
         goodsJson.set("goodsName", goodsName);
         goodsJson.set("goodsPath", goodsPath);
         CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();

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

@@ -68,7 +68,7 @@ public class Video2ServiceImpl implements Video2Service {
         return ResultContent.buildContent(video2Api.rechargeProduct());
     }
 
-    public ResultContent<CreatOrderResultModel> creatOrder(RechargeOrderReq rechargeOrderReq) {
+    public ResultContent<CreatOrderResultModel> creatOrder(RechargeRequest rechargeOrderReq) {
 
         RechargeProductResp rechargeProductResp = video2Api.rechargeProduct();
         List<ProductItemResp> collect = rechargeProductResp.getProducts().stream().filter(productItemResp -> productItemResp.getProductId().equals(rechargeOrderReq.getProductId())).collect(Collectors.toList());
@@ -83,7 +83,7 @@ public class Video2ServiceImpl implements Video2Service {
             return ResultContent.build(ResultState.Fail, "视频会员信息未配置");
         }
         List<ShopInfoSimpleVo> shops = shopSetting.getContent().getShops();
-        if (shops.isEmpty()){
+        if (shops.isEmpty()) {
             return ResultContent.build(ResultState.Fail, "视频会员店铺未创建");
         }
         AccountDetailVo accountDetailVo = shopSetting.getContent();
@@ -110,7 +110,7 @@ public class Video2ServiceImpl implements Video2Service {
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
         createOrder2Model.setPayAmount(totalPrice);
         createOrder2Model.setAccesserUserId(authAccount);
-        createOrder2Model.setChannel(Channel.ZhongShu);
+        createOrder2Model.setCode(rechargeOrderReq.getCode());
         JSONObject goodsInfo = JSONUtil.parseObj(rechargeOrderReq);
         goodsInfo.set("goodsName", productItemResp.getItemName());
 //        goodsInfo.set("goodsPath", addOrderRequest.getRoomPic());
@@ -211,7 +211,7 @@ public class Video2ServiceImpl implements Video2Service {
         createOrder2Model.setDiscountAmount(BigDecimal.ZERO);
         createOrder2Model.setPayAmount(totalPrice);
         createOrder2Model.setAccesserUserId(authAccount);
-        createOrder2Model.setChannel(Channel.ZhongShu);
+        createOrder2Model.setCode(rechargeRequest.getCode());
         JSONObject goodsInfo = JSONUtil.parseObj(rechargeOrderReq);
         goodsInfo.set("goodsName", productItemResp.getItemName());
 

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

@@ -1,8 +1,6 @@
 package com.zswl.cloud.springBtach.server.core.service.impl;
 
 
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
@@ -18,10 +16,6 @@ import com.xiaoju.open.oil.core.QueryClientFactory;
 import com.xiaoju.open.oil.core.executor.ResponseDTO;
 import com.xiaoju.open.oil.interfaces.domain.*;
 import com.xiaoju.open.oil.interfaces.request.*;
-import com.zhongshu.vip.client.model.VipUserModel;
-import com.zhongshu.vip.client.service.VipUserService;
-import com.zswl.cloud.springBatch.client.model.xiaoju.ActivityModel;
-import com.zswl.cloud.springBatch.client.model.xiaoju.QueryApiStorePriceRequest;
 import com.xiaoju.open.oil.interfaces.request.miniprogram.MiniCancelOrderStatusRequest;
 import com.xiaoju.open.oil.interfaces.response.*;
 import com.xiaoju.open.oil.security.secret.SecurityService;
@@ -31,9 +25,13 @@ import com.zhongshu.payment.client.type.JobFlowMap;
 import com.zhongshu.payment.client.type.OrderType;
 import com.zhongshu.payment.client.type.TransferOwner;
 import com.zhongshu.payment.client.type.TransferType;
+import com.zhongshu.payment.client.type.v3.OrderStateType;
+import com.zhongshu.vip.client.service.VipUserService;
 import com.zswl.cloud.shop.client.dto.life.TripartiteShopDto;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.springBatch.client.model.request.*;
+import com.zswl.cloud.springBatch.client.model.xiaoju.ActivityModel;
+import com.zswl.cloud.springBatch.client.model.xiaoju.QueryApiStorePriceRequest;
 import com.zswl.cloud.springBatch.client.model.xiaoju.QueryGetPromotionResponse;
 import com.zswl.cloud.springBatch.client.service.XiaoJuService;
 import com.zswl.cloud.springBtach.server.core.dao.*;
@@ -45,8 +43,6 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.stream.Collectors;
 
 @Log4j2
 @Service
@@ -179,7 +175,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
                 case 2:
                     entries.set("notifyOrderInfo", notificationOrderInfoRequest);
                     updateGoodsModel.setGoodsState(OrderType.USED);
-                    updateOrder2Model.setOrderType(OrderType.HAVE_PAID);
+                    updateGoodsModel.setOrderState(OrderStateType.HAVE_PAID);
                     break;
                 case 6:
                     entries.set("refund", notificationOrderInfoRequest);
@@ -188,12 +184,11 @@ public class XiaoJuServiceImpl implements XiaoJuService {
                 case 9:
                     entries.set("close", notificationOrderInfoRequest);
                     updateGoodsModel.setGoodsState(OrderType.CLOSE);
-                    updateOrder2Model.setOrderType(OrderType.CLOSE);
+                    updateGoodsModel.setOrderState(OrderStateType.CLOSE);
                     break;
             }
             updateGoodsModel.setExtend(entries);
             orderService2.updateGoods(updateGoodsModel);
-            orderService2.updateOrderType(updateOrder2Model);
 
 
         }
@@ -483,7 +478,7 @@ public class XiaoJuServiceImpl implements XiaoJuService {
             shop.setValue(BigDecimal.valueOf(100));
             goods.setTransferRrule(List.of(shop));
             createOrder2Model.setGoodsList(List.of(goods));
-            createOrder2Model.setChannel(xiaoJuQueryNewOrderModel.getChannel());
+            createOrder2Model.setCode(xiaoJuQueryNewOrderModel.getCode());
 
             ResultContent<CreatOrderResultModel> creat = orderService2.creat(createOrder2Model);
             if (!creat.getState().equals(ResultState.Success)) {

SpringBatchServiceServer/src/test/java/com/zswl/cloud/springBtach/server/boot/ServerApplicationTests.java

@@ -27,6 +27,7 @@ import com.xiaoju.open.oil.interfaces.response.miniprogram.MiniQueryNewOrderResp
 import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
 import com.zhongshu.payment.client.model.order.v2.OrderResult2Model;
 import com.zhongshu.payment.client.model.order.v2.UserSeachOrder2Model;
+import com.zhongshu.payment.client.model.payment.zswl.CreatePayment2Model;
 import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.service.v2.PaymentService2;
 import com.zhongshu.payment.client.type.Channel;
@@ -49,7 +50,9 @@ import com.zswl.cloud.springBtach.server.core.api.video.YqdServiceImpl;
 import com.zswl.cloud.springBtach.server.core.api.ypp.KfcApi;
 import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
 import com.zswl.cloud.springBtach.server.core.controller.TestSpringBatch;
+import com.zswl.cloud.springBtach.server.core.dao.ScheduledTaskDao;
 import com.zswl.cloud.springBtach.server.core.dao.XiaoJuActivityReceiverDao;
+import com.zswl.cloud.springBtach.server.core.domain.ScheduledTask;
 import com.zswl.cloud.springBtach.server.core.service.PaymentService;
 import com.zswl.cloud.springBtach.server.core.service.impl.DfyTicketServiceImpl;
 import com.zswl.cloud.springBtach.server.core.service.impl.OrderServiceImpl;
@@ -272,31 +275,15 @@ public class ServerApplicationTests {
     @Autowired
     OilConfig oilConfig;
 
+    @Autowired
+    ScheduledTaskDao scheduledTaskDao;
     @Test
     public void queryNewOrderq1() {
-        MiniProgramQueryNewOrderRequest newOrderRequest = new MiniProgramQueryNewOrderRequest();
-        newOrderRequest.setStoreId("5154031457384536897");
-        newOrderRequest.setGunNo("2");
-        newOrderRequest.setLat(30.280486F);
-        newOrderRequest.setLon(120.094503F);
-        newOrderRequest.setLitre(13450);
-        newOrderRequest.setOpenChannel(1);
-        newOrderRequest.setOrderAmount(10000);
-        newOrderRequest.setRealAmount(7708);
-        newOrderRequest.setOutOrderId("13232344343");
-        newOrderRequest.setOutUserId("65fe583d74d67a7dbd842b45");
-        newOrderRequest.setServiceFee(312);
-        newOrderRequest.setItemId(4879454965524071453L);
-        newOrderRequest.setMobile("13368172379");
-
-        com.xiaoju.open.oil.interfaces.domain.AllowanceInfo allowanceInfo = new com.xiaoju.open.oil.interfaces.domain.AllowanceInfo();
+        ScheduledTask scheduledTask = new ScheduledTask();
+        scheduledTask.setMethod("test");
+        scheduledTask.setCron("0 * * * * *");
+        scheduledTaskDao.save(scheduledTask);
 
-        newOrderRequest.setPromotionInfo(List.of());
-
-
-        QueryClient queryClient = QueryClientFactory.create(oilConfig);
-        MiniQueryNewOrderResponse response = queryClient.apiMini().queryNewOrder(newOrderRequest);
-        System.out.println(response);
 
     }
 
@@ -370,7 +357,7 @@ public class ServerApplicationTests {
     @Test
     public void sync() {
         UserSeachOrder2Model userSeachOrder2Model = new UserSeachOrder2Model();
-        userSeachOrder2Model.setChannel(Channel.ZhongShu);
+//        userSeachOrder2Model.setChannel(Channel.ZhongShu);
         userSeachOrder2Model.setUserId("660a534e32e63427d1a09c2a");
         ResultContent<Page<OrderResult2Model>> pageResultContent = orderService2.userSearch(userSeachOrder2Model);
         System.out.println(JSONUtil.toJsonStr(pageResultContent));