From 96e50b1d8b728fd9d6c3f406e2cd88d570927161 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 23 Apr 2021 11:49:18 +0800 Subject: [PATCH] fix alipay --- .../resources/db/migration/V202104130001__for_cash_out.sql | 3 +++ .../java/com/iformall/controller/WxCashOutController.java | 1 + .../src/main/java/com/iformall/domain/po/WxCashOut.java | 4 ++++ .../com/iformall/service/impl/WxCashOutServiceImpl.java | 2 ++ .../src/main/resources/mapper/WxCashOutMapper.xml | 7 +++++-- 5 files changed, 15 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql index a41739295..aed478377 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql @@ -38,5 +38,8 @@ UPDATE wx_mall SET cash_out_limit = 10 ; ALTER TABLE wx_merchant ADD COLUMN `cash_out_count` INT(3) DEFAULT 0 COMMENT '当日提现次数' ; +ALTER TABLE wx_cash_out ADD COLUMN `phone` VARCHAR(20) NOT NULL COMMENT '提现的手机号' ; +ALTER TABLE wx_cash_out ADD COLUMN `wx_b_open_headImg` VARCHAR(100) COMMENT 'b端微信用户头像' ; + diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 0b30f66b6..392e2954a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -112,6 +112,7 @@ public class WxCashOutController extends BaseController { } wxCashOut.setReciveOpenId(mUser.getOpenId()); wxCashOut.setReciveNickName(mUser.getNickName()); + wxCashOut.setWxBOpenHeadImg(mUser.getAvatarUrl()); }catch(Exception e) { return new ResultData(Result.ERROR,buser.getPhone()+"匹配C端用户失败,该情况可能是存在多个微信对应统一手机号,请联系管理员处理, 。"); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCashOut.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCashOut.java index dc15cb681..23310c9ca 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCashOut.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCashOut.java @@ -36,8 +36,12 @@ public class WxCashOut extends TenantEntity { private String audioRemark; @io.swagger.annotations.ApiModelProperty(value = "merchant_b_user编号", name = "bUserId") private Long bUserId; + @io.swagger.annotations.ApiModelProperty(value = "提现的手机号", name = "phone") + private String phone; @io.swagger.annotations.ApiModelProperty(value = "b端微信用户Id", name = "wxBOpenId") private String wxBOpenId; + @io.swagger.annotations.ApiModelProperty(value = "b端微信用户头像", name = "wxBOpenHeadImg") + private String wxBOpenHeadImg; @io.swagger.annotations.ApiModelProperty(value = "审批时间", name = "audioDate") private Date audioDate; @io.swagger.annotations.ApiModelProperty(value = "提现商户", name = "merchantId") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java index 1d69416f7..4314c378c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java @@ -150,6 +150,8 @@ public class WxCashOutServiceImpl implements WxCashOutService { cashout.setMerchantName(merchant.getName()); cashout.setReciveOpenId(record.getReciveOpenId()); cashout.setReciveNickName(record.getReciveNickName()); + cashout.setPhone(buser.getPhone()); + cashout.setWxBOpenHeadImg(record.getWxBOpenHeadImg()); cashout.updateTenantInfo(buser); wxCashOutMapper.insert(cashout); diff --git a/mallinkService/src/main/resources/mapper/WxCashOutMapper.xml b/mallinkService/src/main/resources/mapper/WxCashOutMapper.xml index 788f30d10..962be253b 100644 --- a/mallinkService/src/main/resources/mapper/WxCashOutMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCashOutMapper.xml @@ -11,7 +11,9 @@ + + @@ -23,8 +25,9 @@ - `id`,`tenant_id`,`parent_tenant_id`,`total_fee`,`status`,`audio_remark`,`create_date`,`update_date`,`b_user_id`,`wx_b_open_id`,`audio_date`, - `merchant_id`,`merchant_name`,`recive_open_id`,`recive_nick_name`,`wx_pay_no`,`wx_pay_time`,`fail_remark` + `id`,`tenant_id`,`parent_tenant_id`,`total_fee`,`status`,`audio_remark`,`create_date`,`update_date`,`b_user_id`,`phone`, + `wx_b_open_id`,`wx_b_open_headImg`,`audio_date`,`merchant_id`,`merchant_name`,`recive_open_id`,`recive_nick_name`, + `wx_pay_no`,`wx_pay_time`,`fail_remark`