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

[商铺商户][修改]:商户pay_id修改为receiver_account,修改逻辑更改,关联merchant_id错误

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
e9bd0e6794
3 измененных файлов: 55 добавлений и 33 удалений
  1. +9
    -6
      mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java
  2. +42
    -23
      mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java
  3. +4
    -4
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

+ 9
- 6
mallinkService/src/main/java/com/simple/domain/po/WxMerchant.java Просмотреть файл

@@ -68,8 +68,8 @@ public class WxMerchant implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="银行开户行",name="bankName")
private String bankName;
/*支付ID,参看wx_pay_account**/
@io.swagger.annotations.ApiModelProperty(value="支付ID,参看wx_pay_account",name="payId")
private Long payId;
@io.swagger.annotations.ApiModelProperty(value="收款帐户",name="receiver_account")
private Long receiverAccount;
/*创建时间**/
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;
@@ -122,12 +122,15 @@ public class WxMerchant implements Serializable {
public void setBankName(String _bankName) {
bankName = _bankName;
}
public Long getPayId() {
return payId;

public Long getReceiverAccount() {
return receiverAccount;
}
public void setPayId(Long _payId) {
payId = _payId;

public void setReceiverAccount(Long receiverAccount) {
this.receiverAccount = receiverAccount;
}

public Date getCreateDate() {
return createDate;
}


+ 42
- 23
mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -90,9 +90,9 @@ public class WxMerchantServiceImpl implements WxMerchantService {
wxAppinfo = wxAppinfoMapper.findList(wxAppinfo).get(0);

final IdWorker idWorker = IdWorker.get();
long merchantid = idWorker.nextId();
if (wxMerchant.getId() == null) {

if (wxMerchant.getId() == null) {
long merchantid = idWorker.nextId();
wxMerchant.setId(merchantid);
Date date = new Date();
wxMerchant.setStatus(1);
@@ -122,6 +122,28 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxShopMapper.updateByPrimaryKeySelective(wxShop);
}

//删除之前的关联用户
List<WxMerchantBUser> bUsers = wxMerchant.getbUsers();

for(WxMerchantBUser user:bUsers){
wxMerchantBUserMapper.deleteByPrimaryKey(user.getId());
}

//保存商户关联用户
for(WxMerchantBUser user:bUsers){
long id = idWorker.nextId();
user.setId(id);
user.setBUserId(id);
user.setMerchantId(merchantid);
user.setTenantId(wxMerchant.getTenantId());
user.setAppId(wxAppinfo.getAppId());
date = new Date();
user.setCreateDate(date);
user.setUpdateDate(date);
wxMerchantBUserMapper.insertSelective(user);

}

} else {

//更新商户
@@ -166,30 +188,27 @@ public class WxMerchantServiceImpl implements WxMerchantService {
WxShopMapper.updateByPrimaryKeySelective(wxShop);
}

}



//删除之前的关联用户
List<WxMerchantBUser> bUsers = wxMerchant.getbUsers();

//删除之前的关联用户
List<WxMerchantBUser> bUsers = wxMerchant.getbUsers();
for(WxMerchantBUser user:bUsers){
wxMerchantBUserMapper.deleteByPrimaryKey(user.getId());
}

for(WxMerchantBUser user:bUsers){
wxMerchantBUserMapper.deleteByPrimaryKey(user.getId());
}
//保存商户关联用户
for(WxMerchantBUser user:bUsers){
long id = idWorker.nextId();
user.setId(id);
user.setBUserId(id);
user.setMerchantId(wxMerchant.getId());
user.setTenantId(wxMerchant.getTenantId());
user.setAppId(wxAppinfo.getAppId());
date = new Date();
user.setCreateDate(date);
user.setUpdateDate(date);
wxMerchantBUserMapper.insertSelective(user);

//保存商户关联用户
for(WxMerchantBUser user:bUsers){
long id = idWorker.nextId();
user.setId(id);
user.setBUserId(id);
user.setMerchantId(merchantid);
user.setTenantId(wxMerchant.getTenantId());
user.setAppId(wxAppinfo.getAppId());
Date date = new Date();
user.setCreateDate(date);
user.setUpdateDate(date);
wxMerchantBUserMapper.insertSelective(user);
}

}



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

@@ -9,7 +9,7 @@
<result column="link_phone" jdbcType="VARCHAR" property="linkPhone" />
<result column="bank_card" jdbcType="VARCHAR" property="bankCard" />
<result column="bank_name" jdbcType="VARCHAR" property="bankName" />
<result column="pay_id" jdbcType="BIGINT" property="payId" />
<result column="receiver_account" jdbcType="BIGINT" property="receiverAccount" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="car_vendor_type" jdbcType="INTEGER" property="carVendorType" />
@@ -19,7 +19,7 @@
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`pay_id`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`
`id`,`tenant_id`,`img_url`,`name`,`link_phone`,`bank_card`,`bank_name`,`receiver_account`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`
</sql>

<sql id="dynamicWhereConditions">
@@ -60,8 +60,8 @@
</if>
<if test=" null != payId ">
and `pay_id` = #{payId}
<if test=" null != receiverAccount ">
and `receiver_account` = #{receiverAccount}
</if>


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