Преглед изворни кода

[B端用户只取有效用户][新增]

release_toaliyun_real
Stormeye.Wu пре 7 година
родитељ
комит
2b91ddfb77
3 измењених фајлова са 9 додато и 7 уклоњено
  1. +2
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java
  3. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

+ 2
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java Прегледај датотеку

@@ -7,6 +7,7 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxMall;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.enums.EnumMerchantBUserStatus;
import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumMerchantStatus;
import com.iformall.service.WxMallService; import com.iformall.service.WxMallService;
import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantBUserService;
@@ -113,6 +114,7 @@ public class WxMerchantBUserController extends BaseController {
WxMerchantBUser user = new WxMerchantBUser(); WxMerchantBUser user = new WxMerchantBUser();
user.setAppId(appId); user.setAppId(appId);
user.setPhone(phone); user.setPhone(phone);
user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode());


Date currentDate = new Date(); Date currentDate = new Date();
WxMerchantBUser user1 = null; WxMerchantBUser user1 = null;


+ 2
- 2
mallinkService/src/main/java/com/iformall/enums/EnumMerchantBUserStatus.java Прегледај датотеку

@@ -5,8 +5,8 @@ package com.iformall.enums;
*/ */
public enum EnumMerchantBUserStatus { public enum EnumMerchantBUserStatus {


NOT_BOUND(0, "绑定"),
BOUND(1, "未绑定"),
VALID(0, "有效/绑定"),
NOT_VALID(1, "无效/未绑定"),
; ;


public static EnumMerchantBUserStatus getEnum(Integer code) { public static EnumMerchantBUserStatus getEnum(Integer code) {


+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Прегледај датотеку

@@ -99,7 +99,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {


WxMerchantBUser wxMerchantBUser = new WxMerchantBUser(); WxMerchantBUser wxMerchantBUser = new WxMerchantBUser();
wxMerchantBUser.setMerchantId(wxMerchant.getId()); wxMerchantBUser.setMerchantId(wxMerchant.getId());
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.BOUND.getCode());
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode());
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser); List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findList(wxMerchantBUser);
wxMerchant.setbUsers(bUserList); wxMerchant.setbUsers(bUserList);
return wxMerchant; return wxMerchant;
@@ -217,7 +217,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
date = new Date(); date = new Date();
user.setCreateDate(date); user.setCreateDate(date);
user.setUpdateDate(date); user.setUpdateDate(date);
user.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode());
user.setStatus(EnumMerchantBUserStatus.VALID.getCode());
wxMerchantBUserMapper.insertSelective(user); wxMerchantBUserMapper.insertSelective(user);


} //添加商户的分账账户(不是必选) } //添加商户的分账账户(不是必选)
@@ -296,7 +296,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
bUser.setMerchantId(wxMerchant.getId()); bUser.setMerchantId(wxMerchant.getId());
List<WxMerchantBUser> wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); List<WxMerchantBUser> wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser);
for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){ for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode());
wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode());
wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser);
} }


@@ -313,7 +313,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
date = new Date(); date = new Date();
user.setCreateDate(date); user.setCreateDate(date);
user.setUpdateDate(date); user.setUpdateDate(date);
user.setStatus(EnumMerchantBUserStatus.BOUND.getCode());
user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode());
wxMerchantBUserMapper.insertSelective(user); wxMerchantBUserMapper.insertSelective(user);
}else{//有id的更新 }else{//有id的更新
user.setBUserId(user.getId()); user.setBUserId(user.getId());
@@ -322,7 +322,7 @@ public class WxMerchantServiceImpl implements WxMerchantService {
user.setAppId(wxAppinfo.getAppId()); user.setAppId(wxAppinfo.getAppId());
date = new Date(); date = new Date();
user.setUpdateDate(date); user.setUpdateDate(date);
user.setStatus(EnumMerchantBUserStatus.BOUND.getCode());
user.setStatus(EnumMerchantBUserStatus.NOT_VALID.getCode());
wxMerchantBUserMapper.updateByPrimaryKeySelective(user); wxMerchantBUserMapper.updateByPrimaryKeySelective(user);
} }




Loading…
Откажи
Сачувај