Merge branch 'dev/2024/0717/update-app-Y' of Harper/feifan-backend-zx-app into master

添加用户信息,支付宝账号和银行账号

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java

@@ -56,4 +56,19 @@ public class AppMemberUserInfoRespVO {
     @Schema(description = "登录用的用户名", example = "张三")
     private String username;
 
+    @Schema(description = "支付宝账号", example = "6872")
+    private String alipayAccount;
+
+    @Schema(description = "支付宝名称", example = "李四")
+    private String alipayName;
+
+    @Schema(description = "开户行名称", example = "李四")
+    private String bankName;
+
+    @Schema(description = "开户名", example = "王五")
+    private String accountName;
+
+    @Schema(description = "银行账号", example = "31488")
+    private String bankAccount;
+
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/user/vo/AppMemberUserUpdateReqVO.java

@@ -21,4 +21,19 @@ public class AppMemberUserUpdateReqVO {
     @Schema(description = "用户名")
     private String username;
 
+    @Schema(description = "支付宝账号", example = "6872")
+    private String alipayAccount;
+
+    @Schema(description = "支付宝名称", example = "李四")
+    private String alipayName;
+
+    @Schema(description = "开户行名称", example = "李四")
+    private String bankName;
+
+    @Schema(description = "开户名", example = "王五")
+    private String accountName;
+
+    @Schema(description = "银行账号", example = "31488")
+    private String bankAccount;
+
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/dal/dataobject/user/MemberUserDO.java

@@ -150,4 +150,24 @@ public class MemberUserDO extends TenantBaseDO {
      */
     private String username;
 
+    /**
+     * 支付宝账号
+     */
+    private String alipayAccount;
+    /**
+     * 支付宝名称
+     */
+    private String alipayName;
+    /**
+     * 开户行名称
+     */
+    private String bankName;
+    /**
+     * 开户名
+     */
+    private String accountName;
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
 }

feifan-module-pay/feifan-module-pay-api/src/main/java/cn/newfeifan/mall/module/pay/enums/DictTypeConstants.java

@@ -26,6 +26,7 @@ public interface DictTypeConstants {
 
     // 富友支付的商户号
     String mchnt_cd = "0006420F7357129";
+    String charset = "utf-8";
 
     String term_id = "88888888";
 

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/fuiou/client/CommonQueryClient.java

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.pay.fuiou.client;
 
 import cn.newfeifan.mall.module.pay.fuiou.respVO.FuYouQueryPayOrderResponseVO;
+import cn.newfeifan.mall.module.pay.fuiou.util.DateUtils;
 import com.alibaba.fastjson.JSON;
 import cn.newfeifan.mall.module.pay.fuiou.reqdata.CommonQueryDataReq;
 import cn.newfeifan.mall.module.pay.fuiou.util.FuiouHttpPoster;
@@ -18,12 +19,13 @@ public class CommonQueryClient {
 	
 	public static void main(String[] args) throws Exception {
 		FuiouHttpPoster http = new FuiouHttpPoster();
-		http.setCharset("utf-8");
+		http.setCharset(charset);
 		http.setUrl("https://aipay.fuioupay.com/aggregatePay/commonQuery");
 		CommonQueryDataReq req=new CommonQueryDataReq();
 		req.setVersion("1.0");
 		req.setMchnt_cd(mchnt_cd);
-		req.setRandom_str("201707041112123456");
+		req.setRandom_str(DateUtils.getCurrentDate("yyyyMMddHHmmss")
+				+ "568974");
 		req.setOrder_type("JSAPI");
 		req.setMchnt_order_no("16103-202407112111001");
 		req.setTerm_id("88888888");

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/fuiou/client/QueryFeeAmtClient.java

@@ -1,10 +1,13 @@
 package cn.newfeifan.mall.module.pay.fuiou.client;
 
+import cn.newfeifan.mall.module.pay.fuiou.util.DateUtils;
 import cn.newfeifan.mall.module.pay.fuiou.util.FuiouHttpPoster;
 import cn.newfeifan.mall.module.pay.fuiou.util.MD5;
 import com.alibaba.fastjson.JSON;
 import cn.newfeifan.mall.module.pay.fuiou.reqdata.QueryFeeAmtDataReq;
 
+import static cn.newfeifan.mall.module.pay.enums.DictTypeConstants.*;
+
 /**
  * 类功能描述
  * QueryFeeAmtClient.java
@@ -15,16 +18,15 @@ import cn.newfeifan.mall.module.pay.fuiou.reqdata.QueryFeeAmtDataReq;
  */
 public class QueryFeeAmtClient {
 
-	public static String privateKey = "4e092f20607e11e71d2214ad47a356fa";
-	
 	public static void main(String[] args) throws Exception {
 		FuiouHttpPoster http = new FuiouHttpPoster();
-		http.setCharset("utf-8");
-		http.setUrl("http://192.168.8.45:45002/aggregatePay/queryFeeAmt");
+		http.setCharset(charset);
+		http.setUrl("https://aipay.fuioupay.com/aggregatePay/queryFeeAmt");
 		QueryFeeAmtDataReq req = new QueryFeeAmtDataReq();
-		req.setMchnt_cd("0002900F0370586");
-		req.setRandom_str("123456");
-		req.setAmt("200000");
+		req.setMchnt_cd(mchnt_cd);
+		req.setRandom_str(DateUtils.getCurrentDate("yyyyMMddHHmmss")
+				+ "568974");
+		req.setAmt("1");
 		req.setSign(MD5.MD5Encode(req.getMchnt_cd() + "|" + req.getAmt() + "|" + req.getRandom_str() + "|" + privateKey, "UTF-8"));
 		String res = http.newPost(JSON.toJSONString(req));
 		System.out.println(res);

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/fuiou/client/QueryWithdrawAmtClient.java

@@ -1,10 +1,13 @@
 package cn.newfeifan.mall.module.pay.fuiou.client;
 
+import cn.newfeifan.mall.module.pay.fuiou.util.DateUtils;
 import cn.newfeifan.mall.module.pay.fuiou.util.FuiouHttpPoster;
 import cn.newfeifan.mall.module.pay.fuiou.util.MD5;
 import com.alibaba.fastjson.JSON;
 import cn.newfeifan.mall.module.pay.fuiou.reqdata.QueryWithdrawAmtDataReq;
 
+import static cn.newfeifan.mall.module.pay.enums.DictTypeConstants.*;
+
 /**
  * 类功能描述
  * QueryWithdrawAmtClient.java
@@ -15,15 +18,14 @@ import cn.newfeifan.mall.module.pay.fuiou.reqdata.QueryWithdrawAmtDataReq;
  */
 public class QueryWithdrawAmtClient {
 
-	public static String privateKey = "4e092f20607e11e71d2214ad47a356fa";
-	
 	public static void main(String[] args) throws Exception {
 		FuiouHttpPoster http = new FuiouHttpPoster();
-		http.setCharset("utf-8");
-		http.setUrl("http://192.168.8.45:45002/aggregatePay/queryWithdrawAmt");
+		http.setCharset(charset);
+		http.setUrl("https://aipay.fuioupay.com/aggregatePay/queryWithdrawAmt");
 		QueryWithdrawAmtDataReq req = new QueryWithdrawAmtDataReq();
-		req.setMchnt_cd("0002900F0370586");
-		req.setRandom_str("123456");
+		req.setMchnt_cd(mchnt_cd);
+		req.setRandom_str(DateUtils.getCurrentDate("yyyyMMddHHmmss")
+				+ "568974");
 		req.setSign(MD5.MD5Encode(req.getMchnt_cd() + "|" + req.getRandom_str() + "|" + privateKey, "UTF-8"));
 		String res = http.newPost(JSON.toJSONString(req));
 		System.out.println(res);