代码优化

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/OmsOrderClient.java

@@ -3,18 +3,16 @@ package com.chelvc.cloud.vehicle.client;
 import com.chelvc.cloud.vehicle.client.dto.ConfirmOrderResultDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderDetailDTO;
+import com.chelvc.cloud.vehicle.client.dto.WechatUnifiedOrder;
 import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderPagingParam;
 import com.chelvc.cloud.vehicle.client.param.OrderRefundParam;
 import com.chelvc.cloud.vehicle.client.param.SxyNotifyParam;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.wechat.WechatUnifiedOrder;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotNull;
 import java.util.Map;
 
 /**

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/WechatUnifiedOrder.java

@@ -0,0 +1,88 @@
+package com.chelvc.cloud.vehicle.client.dto;
+
+import java.io.Serializable;
+
+import com.chelvc.framework.wechat.PayChannel;
+import com.chelvc.framework.wechat.PayMode;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 微信统一下单信息
+ *
+ * @author Woody
+ * @date 2024/1/30
+ */
+@Data
+@Deprecated
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WechatUnifiedOrder implements Serializable {
+    /**
+     * 支付方式
+     */
+    private PayMode mode;
+
+    /**
+     * 应用标识
+     */
+    private String appid;
+
+    /**
+     * 商户标识
+     */
+    private String mchid;
+
+    /**
+     * 订单标识
+     */
+    private String order;
+
+    /**
+     * 数字签名
+     */
+    private String sign;
+
+    /**
+     * 支付package
+     */
+    private String pack;
+
+    /**
+     * 随机串
+     */
+    private String nonce;
+
+    /**
+     * 预支付ID
+     */
+    private String prepayid;
+
+    /**
+     * 签名算法
+     */
+    private String algorithm;
+
+    /**
+     * 二维码地址
+     */
+    private String qrcode;
+
+    /**
+     * 跳转链接
+     */
+    private String redirect;
+
+    /**
+     * 时间戳
+     */
+    private String timestamp;
+
+    /**
+     * 支付渠道
+     */
+    private PayChannel channel;
+}

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/controller/OmsOrderController.java

@@ -5,22 +5,17 @@ import java.util.Map;
 import com.chelvc.cloud.vehicle.client.dto.ConfirmOrderResultDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderDTO;
 import com.chelvc.cloud.vehicle.client.dto.OmsOrderDetailDTO;
+import com.chelvc.cloud.vehicle.client.dto.WechatUnifiedOrder;
 import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderPagingParam;
 import com.chelvc.cloud.vehicle.client.param.OrderRefundParam;
 import com.chelvc.cloud.vehicle.client.param.SxyNotifyParam;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderService;
-import com.chelvc.framework.common.function.Executor;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.database.context.DatabaseContextHolder;
-import com.chelvc.framework.wechat.WechatUnifiedOrder;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotNull;
-
 /**
  * 订单Service接口
  *

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/OmsOrderService.java

@@ -1,6 +1,5 @@
 package com.chelvc.cloud.vehicle.server.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.chelvc.cloud.vehicle.client.dto.*;
 import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
 import com.chelvc.cloud.vehicle.client.param.OrderPagingParam;
@@ -9,7 +8,6 @@ import com.chelvc.cloud.vehicle.client.param.SxyNotifyParam;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.database.support.EnhanceService;
-import com.chelvc.framework.wechat.WechatUnifiedOrder;
 import com.upay.sdk.onlinepay.builder.OrderResponse;
 import org.springframework.web.bind.annotation.RequestBody;
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/OnlinePayService.java

@@ -1,11 +1,9 @@
 package com.chelvc.cloud.vehicle.server.service;
 
+import com.chelvc.cloud.vehicle.client.dto.WechatUnifiedOrder;
 import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
-import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyModifyParam;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderItem;
-import com.chelvc.framework.wechat.WechatUnifiedOrder;
-import com.upay.sdk.onlinepay.builder.OrderResponse;
 
 import java.util.List;
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderServiceImpl.java

@@ -33,7 +33,6 @@ import com.chelvc.framework.common.util.ObjectUtils;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import com.chelvc.framework.redis.context.RedisContextHolder;
-import com.chelvc.framework.wechat.WechatUnifiedOrder;
 import com.upay.sdk.onlinepay.builder.OrderResponse;
 import io.netty.util.HashedWheelTimer;
 import io.netty.util.Timeout;
@@ -47,7 +46,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -55,7 +53,6 @@ import java.security.SecureRandom;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OnlinePayServiceImpl.java

@@ -3,9 +3,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.chelvc.cloud.user.client.UserClient;
 import com.chelvc.cloud.user.client.dto.UserDTO;
 import com.chelvc.cloud.vehicle.client.constant.TradeConstant;
+import com.chelvc.cloud.vehicle.client.dto.WechatUnifiedOrder;
 import com.chelvc.cloud.vehicle.client.param.OmsOrderModifyParam;
-import com.chelvc.cloud.vehicle.client.param.OrderReturnApplyModifyParam;
-import com.chelvc.cloud.vehicle.server.entity.MerchantRelation;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderItem;
 import com.chelvc.cloud.vehicle.server.service.AssetService;
@@ -17,7 +16,6 @@ import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.wechat.PayChannel;
 import com.chelvc.framework.wechat.PayMode;
-import com.chelvc.framework.wechat.WechatUnifiedOrder;
 import com.upay.sdk.entity.Payer;
 import com.upay.sdk.entity.ProductDetail;
 import com.upay.sdk.exception.HmacVerifyException;