Просмотр исходного кода

fix alipay

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
96e50b1d8b
5 измененных файлов: 15 добавлений и 2 удалений
  1. +3
    -0
      mallinkAdmin/src/main/resources/db/migration/V202104130001__for_cash_out.sql
  2. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCashOut.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java
  5. +5
    -2
      mallinkService/src/main/resources/mapper/WxCashOutMapper.xml

+ 3
- 0
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_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端微信用户头像' ;






+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java Просмотреть файл

@@ -112,6 +112,7 @@ public class WxCashOutController extends BaseController {
} }
wxCashOut.setReciveOpenId(mUser.getOpenId()); wxCashOut.setReciveOpenId(mUser.getOpenId());
wxCashOut.setReciveNickName(mUser.getNickName()); wxCashOut.setReciveNickName(mUser.getNickName());
wxCashOut.setWxBOpenHeadImg(mUser.getAvatarUrl());
}catch(Exception e) { }catch(Exception e) {
return new ResultData(Result.ERROR,buser.getPhone()+"匹配C端用户失败,该情况可能是存在多个微信对应统一手机号,请联系管理员处理, 。"); return new ResultData(Result.ERROR,buser.getPhone()+"匹配C端用户失败,该情况可能是存在多个微信对应统一手机号,请联系管理员处理, 。");
} }


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCashOut.java Просмотреть файл

@@ -36,8 +36,12 @@ public class WxCashOut extends TenantEntity {
private String audioRemark; private String audioRemark;
@io.swagger.annotations.ApiModelProperty(value = "merchant_b_user编号", name = "bUserId") @io.swagger.annotations.ApiModelProperty(value = "merchant_b_user编号", name = "bUserId")
private Long bUserId; private Long bUserId;
@io.swagger.annotations.ApiModelProperty(value = "提现的手机号", name = "phone")
private String phone;
@io.swagger.annotations.ApiModelProperty(value = "b端微信用户Id", name = "wxBOpenId") @io.swagger.annotations.ApiModelProperty(value = "b端微信用户Id", name = "wxBOpenId")
private String wxBOpenId; private String wxBOpenId;
@io.swagger.annotations.ApiModelProperty(value = "b端微信用户头像", name = "wxBOpenHeadImg")
private String wxBOpenHeadImg;
@io.swagger.annotations.ApiModelProperty(value = "审批时间", name = "audioDate") @io.swagger.annotations.ApiModelProperty(value = "审批时间", name = "audioDate")
private Date audioDate; private Date audioDate;
@io.swagger.annotations.ApiModelProperty(value = "提现商户", name = "merchantId") @io.swagger.annotations.ApiModelProperty(value = "提现商户", name = "merchantId")


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCashOutServiceImpl.java Просмотреть файл

@@ -150,6 +150,8 @@ public class WxCashOutServiceImpl implements WxCashOutService {
cashout.setMerchantName(merchant.getName()); cashout.setMerchantName(merchant.getName());
cashout.setReciveOpenId(record.getReciveOpenId()); cashout.setReciveOpenId(record.getReciveOpenId());
cashout.setReciveNickName(record.getReciveNickName()); cashout.setReciveNickName(record.getReciveNickName());
cashout.setPhone(buser.getPhone());
cashout.setWxBOpenHeadImg(record.getWxBOpenHeadImg());
cashout.updateTenantInfo(buser); cashout.updateTenantInfo(buser);
wxCashOutMapper.insert(cashout); wxCashOutMapper.insert(cashout);


+ 5
- 2
mallinkService/src/main/resources/mapper/WxCashOutMapper.xml Просмотреть файл

@@ -11,7 +11,9 @@
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="b_user_id" jdbcType="BIGINT" property="bUserId" /> <result column="b_user_id" jdbcType="BIGINT" property="bUserId" />
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="wx_b_open_id" jdbcType="VARCHAR" property="wxBOpenId" /> <result column="wx_b_open_id" jdbcType="VARCHAR" property="wxBOpenId" />
<result column="wx_b_open_headImg" jdbcType="VARCHAR" property="wxBOpenHeadImg" />
<result column="audio_date" jdbcType="TIMESTAMP" property="audioDate" /> <result column="audio_date" jdbcType="TIMESTAMP" property="audioDate" />
<result column="merchant_id" jdbcType="VARCHAR" property="merchantId" /> <result column="merchant_id" jdbcType="VARCHAR" property="merchantId" />
<result column="merchant_name" jdbcType="VARCHAR" property="merchantName" /> <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" />
@@ -23,8 +25,9 @@
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
`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`
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Загрузка…
Отмена
Сохранить