启用BaseDTO, 提供给前端的接口，统一加上请求来源字段

jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java

@@ -60,7 +60,6 @@ public class PayController extends BaseController {
 	 * 充值余额支付/微信余额充值
 	 * 提供给小程序使用
 	 * http://localhost:8080/uniapp/pay/weixinPay
-	 * @deprecated 使用汇付支付，充值余额
 	 */
 	// @PostMapping("/weixinPay")
 	// public RestApiResponse<?> weixinPay(HttpServletRequest request, @RequestBody WeixinPayDTO dto) {
@@ -160,7 +159,7 @@ public class PayController extends BaseController {
 	}
 
 	/**
-	 * 7003 获取支付方式
+	 * 7003 获取支付方式/查询支付方式
 	 * http://localhost:8080/uniapp/pay/getPayMode
 	 */
 	@PostMapping("/getPayMode")

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -2002,15 +2002,22 @@ public class SpringBootTestController {
         OrderBasicInfo basicInfo = orderBasicInfoService.generateOrder(dto);
 
         // 支付订单
-        PayOrderDTO payOrderDTO = new PayOrderDTO();
+        // PayOrderDTO payOrderDTO = new PayOrderDTO();
-        payOrderDTO.setOrderCode(basicInfo.getOrderCode());
+        // payOrderDTO.setOrderCode(basicInfo.getOrderCode());
-        payOrderDTO.setPayAmount(totalAccountAmount);
+        // payOrderDTO.setPayAmount(totalAccountAmount);
-        payOrderDTO.setPayMode(dto.getPayMode());
+        // payOrderDTO.setPayMode(dto.getPayMode());
-        payOrderDTO.setMemberId(dto.getMemberId());
+        // payOrderDTO.setMemberId(dto.getMemberId());
         // payOrderDTO.setCode();
         // payOrderDTO.setLockValue();
         // payOrderDTO.setOrderBasicInfo(basicInfo);
 
+        PayOrderDTO build = PayOrderDTO.builder()
+                .orderCode(basicInfo.getOrderCode())
+                .payAmount(totalAccountAmount)
+                .payMode(dto.getPayMode())
+                .memberId(dto.getMemberId())
+                .build();
+
         // Map<String, Object> map = orderBasicInfoService.payOrder(payOrderDTO);
         // System.out.println(map);
     }

jsowell-pile/src/main/java/com/jsowell/pile/dto/AlipayLoginDTO.java

@@ -1,9 +1,11 @@
 package com.jsowell.pile.dto;
 
 import lombok.Data;
+import lombok.experimental.SuperBuilder;
 
 @Data
-public class AlipayLoginDTO {
+@SuperBuilder
+public class AlipayLoginDTO extends BaseDTO{
     /**
      * 手机号密文
      */
@@ -14,8 +16,4 @@ public class AlipayLoginDTO {
      */
     private String appId;
 
-    /**
-     * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
-     */
-    private String requestSource;
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/BaseDTO.java

@@ -0,0 +1,17 @@
+package com.jsowell.pile.dto;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+/**
+ * 基础DTO
+ */
+@Data
+@SuperBuilder
+public class BaseDTO {
+
+    /**
+     * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
+     */
+    protected String requestSource;
+}

jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberRegisterAndLoginDTO.java

@@ -1,15 +1,11 @@
 package com.jsowell.pile.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 @Data
-@AllArgsConstructor
+@SuperBuilder
-@NoArgsConstructor
+public class MemberRegisterAndLoginDTO extends BaseDTO{
-@Builder
-public class MemberRegisterAndLoginDTO {
 	/**
 	 * 手机号
 	 */
@@ -34,9 +30,4 @@ public class MemberRegisterAndLoginDTO {
 	 * 微信用户openId
 	 */
 	private String openId;
-
-	/**
-	 * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
-	 */
-	private String requestSource;
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/PayOrderDTO.java

@@ -1,7 +1,10 @@
 package com.jsowell.pile.dto;
 
 import com.jsowell.common.enums.ykc.ScenarioEnum;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
 import java.math.BigDecimal;
 
@@ -9,7 +12,8 @@ import java.math.BigDecimal;
  * 支付订单DTO
  */
 @Data
-public class PayOrderDTO {
+@SuperBuilder
+public class PayOrderDTO extends BaseDTO{
 	/**
 	 * 会员id
 	 */
@@ -76,8 +80,4 @@ public class PayOrderDTO {
 	 */
 	private String delayMode;
 
-	/**
-	 * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
-	 */
-	private String requestSource;
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/WechatLoginDTO.java

@@ -1,12 +1,14 @@
 package com.jsowell.pile.dto;
 
 import lombok.Data;
+import lombok.experimental.SuperBuilder;
 
 /**
  * 微信登录注册dto
  */
 @Data
-public class WechatLoginDTO {
+@SuperBuilder
+public class WechatLoginDTO extends BaseDTO{
 	/**
 	 * 前端获取到的authCode
 	 */
@@ -22,8 +24,4 @@ public class WechatLoginDTO {
 	 */
 	private String openIdCode;
 
-	/**
-	 * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
-	 */
-	private String requestSource;
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/agentDev/AgentWechatLoginDTO.java

@@ -1,6 +1,8 @@
 package com.jsowell.pile.dto.agentDev;
 
+import com.jsowell.pile.dto.BaseDTO;
 import lombok.Data;
+import lombok.experimental.SuperBuilder;
 
 /**
  * 第三方平台登录DTO
@@ -9,7 +11,8 @@ import lombok.Data;
  * @Date 2023/8/3 15:18
  */
 @Data
-public class AgentWechatLoginDTO {
+@SuperBuilder
+public class AgentWechatLoginDTO extends BaseDTO {
     /**
      * 用于获取手机号的code
      */
@@ -25,8 +28,4 @@ public class AgentWechatLoginDTO {
      */
     private String openIdCode;
 
-    /**
-     * 请求来源, 参见{@link com.jsowell.common.enums.adapay.AdapayPayChannelEnum}
-     */
-    private String requestSource;
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -2465,17 +2465,24 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         logger.info("生成订单 result:{}", JSON.toJSONString(map));
 
         // 支付订单
-        PayOrderDTO payOrderDTO = new PayOrderDTO();
+        // PayOrderDTO payOrderDTO = new PayOrderDTO();
-        payOrderDTO.setOrderCode(basicInfo.getOrderCode());
+        // payOrderDTO.setOrderCode(basicInfo.getOrderCode());
-        payOrderDTO.setPayAmount(accountBalance);
+        // payOrderDTO.setPayAmount(accountBalance);
-        payOrderDTO.setPayMode(dto.getPayMode());
+        // payOrderDTO.setPayMode(dto.getPayMode());
-        payOrderDTO.setMemberId(dto.getMemberId());
+        // payOrderDTO.setMemberId(dto.getMemberId());
-        payOrderDTO.setStartMode(dto.getStartMode());
+        // payOrderDTO.setStartMode(dto.getStartMode());
+        // payOrderDTO.setRequestSource("");
         // payOrderDTO.setCode();
         // payOrderDTO.setLockValue();
         // payOrderDTO.setOrderBasicInfo(basicInfo);
 
-        // payOrder(payOrderDTO);
+        PayOrderDTO payOrderDTO = PayOrderDTO.builder()
+                .orderCode(basicInfo.getOrderCode())
+                .payAmount(accountBalance)
+                .payMode(dto.getPayMode())
+                .memberId(dto.getMemberId())
+                .startMode(dto.getStartMode())
+                .build();
 
         String mode = pileMerchantInfoService.getDelayModeByMerchantId(merchantId);
         // 获取处理逻辑