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

//先屏蔽券订单导出 B端手机号

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
564a5d5dcc
2 измененных файлов: 21 добавлений и 21 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  2. +20
    -20
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Просмотреть файл

@@ -152,7 +152,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {
public void setbuserPhone(String bUserPhone) {
this.bUserPhone = bUserPhone;
}
@Excel(name = "商户操作人", width = 50, orderNum = "5")
// @Excel(name = "商户操作人", width = 50, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone")
private String bUserPhone;
@Excel(name = "所属商户", width = 50, orderNum = "3")


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

@@ -843,7 +843,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
//循环list,获取 cUserId
List<Long> cUserIdList = new ArrayList<Long>();
List<Long> bUserIdList = new ArrayList<Long>();
// List<Long> bUserIdList = new ArrayList<Long>();
// List<Long> merchantIdList = new ArrayList<Long>();
List<Long> couponIdList = new ArrayList<Long>();
for (int i = 0 ; i < list.size() ; i ++ ) {
@@ -852,10 +852,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
if (null != cusrid && (!cUserIdList.contains(cusrid))) {
cUserIdList.add(cusrid);
}
Long bUserId = bo.getBUserId();
if(null != bUserId && (!bUserIdList.contains(bUserId))){
bUserIdList.add(bUserId);
}
// Long bUserId = bo.getBUserId();
// if(null != bUserId && (!bUserIdList.contains(bUserId))){
// bUserIdList.add(bUserId);
// }

// Long bmerchantId = bo.getBMerchantId();
// if (null != bmerchantId && (!merchantIdList.contains(bmerchantId))) {
@@ -867,18 +867,18 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
}

Map<Long,String> buserPhoneMap = new HashMap<Long,String>();
if(bUserIdList.size() > 0){
WxMerchantBUser buserQ = new WxMerchantBUser();
buserQ.updateTenantInfo(tenantEntity);
buserQ.setIds(bUserIdList);
List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findSimpleList(buserQ);
if(null != bUserList && bUserList.size() > 0){
for (WxMerchantBUser bUser: bUserList) {
buserPhoneMap.put(bUser.getId(),bUser.getPhone());
}
}
}
// Map<Long,String> buserPhoneMap = new HashMap<Long,String>();
// if(bUserIdList.size() > 0){
// WxMerchantBUser buserQ = new WxMerchantBUser();
// buserQ.updateTenantInfo(tenantEntity);
// buserQ.setIds(bUserIdList);
// List<WxMerchantBUser> bUserList = wxMerchantBUserMapper.findSimpleList(buserQ);
// if(null != bUserList && bUserList.size() > 0){
// for (WxMerchantBUser bUser: bUserList) {
// buserPhoneMap.put(bUser.getId(),bUser.getPhone());
// }
// }
// }
Map<Long,String> merchantNameMap = new HashMap<Long,String>();
// if (null != merchantIdList && merchantIdList.size() > 0 ) {
@@ -1009,9 +1009,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
co.setVerifyMerchantName(merchantNameMap.get(bMechantId));
}
//co.setChannelType();)
if(null != co.getBUserId()){
co.setbUserPhone(buserPhoneMap.get(co.getBUserId()));
}
// if(null != co.getBUserId()){
// co.setbUserPhone(buserPhoneMap.get(co.getBUserId()));
// }
retList.add(co);
} catch (IllegalAccessException e) {


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