channel 跟改为code,区分订单状态和商品状态

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

@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
 @NoArgsConstructor
 public class OrderRequest {
     @NotNull
-    private Channel channel;
+    private String code;
     private String adcode;
     private String originName;
     private String originLocation;

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

@@ -11,6 +11,7 @@ import java.math.BigDecimal;
 @AllArgsConstructor
 @NoArgsConstructor
 public class RechargeCreateModel {
+    String code;
     String sign;
     String phone;
     String shopName;

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

@@ -33,5 +33,5 @@ public class XiaoJuQueryNewOrderModel {
     private String outNewUserFlag;
     private List<AllowanceInfo> promotionInfo;
     @NotNull
-    private Channel channel;
+    private String code;
 }

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

@@ -33,4 +33,6 @@ public class RechargeRequest {
     @NotNull
     @ApiModelProperty(value = "用户ID", required = true)
     private String userId;
+
+    private String code;
 }

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

@@ -16,7 +16,7 @@ import java.util.List;
 @NoArgsConstructor
 public class CreateOrdereRquest {
 
-    private Channel channel;
+    private String code;
 
     private String shopName;
 

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

@@ -15,7 +15,7 @@ import java.time.OffsetDateTime;
 @NoArgsConstructor
 public class CreateOrder2Request {
 
-    private Channel channel;
+    private String code;
     /**
      * 有票票分配的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/OrderController.java

@@ -5,7 +5,6 @@ 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;
@@ -65,7 +64,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());
 
         // 店铺详情

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

@@ -152,8 +152,8 @@ public class PaymentController {
     @ApiOperation("平台_提现按钮")
     @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 String code) {
+        return paymentServer.withdrawalsPlatformApplication(code);
     }
 
     @ApiOperation("店铺_提现订单列表")

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

@@ -7,6 +7,7 @@ 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.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;
@@ -35,7 +36,7 @@ public class Video2Controller {
     @ApiOperation("创建视频会员订单")
     @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/service/PaymentService.java

@@ -133,10 +133,9 @@ public class PaymentService {
         return paymentService2.applicationWithdrawals(applyWithdrawalsModel);
     }
 
-    public ResultContent withdrawalsPlatformApplication(Channel channel) {
+    public ResultContent withdrawalsPlatformApplication(String code) {
         ApplyWithdrawalsModel applyWithdrawalsModel = new ApplyWithdrawalsModel();
-        applyWithdrawalsModel.setShopId(channel.name());
-        applyWithdrawalsModel.setChannel(channel);
+        applyWithdrawalsModel.setCode(code);
         applyWithdrawalsModel.setPlatform(true);
         return paymentService2.applicationWithdrawals(applyWithdrawalsModel);
     }

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

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

@@ -18,6 +18,7 @@ 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.payment.client.type.v3.OrderStateType;
 import com.zhongshu.vip.client.model.VipUserModel;
 import com.zhongshu.vip.client.service.VipUserService;
 import com.zswl.cloud.springBatch.client.model.xiaoju.ActivityModel;
@@ -179,7 +180,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 +189,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 +483,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)) {