From a6898191312b665ac0154f7913a65582e398e30c Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 5 Aug 2022 14:00:38 +0800 Subject: [PATCH 1/4] // merchant --- .../basic/WxMerchantBUserController.java | 21 ++++++++++ .../com/iformall/domain/po/WxMerchant.java | 3 ++ .../iformall/domain/po/WxMerchantBUser.java | 19 ++++++++- .../mapper/WxMerchantBUserMapper.java | 8 ++-- .../impl/WxMerchantBUserServiceImpl.java | 41 ++++++++++++++++++- .../service/impl/WxMerchantServiceImpl.java | 18 ++++++++ .../mapper/WxMerchantBUserMapper.xml | 18 ++++++++ 7 files changed, 123 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java index bf6af813f..e7f619258 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java @@ -1,10 +1,16 @@ package com.iformall.controller.basic; +import com.github.pagehelper.PageInfo; +import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxMerchant; +import com.iformall.domain.po.WxMerchantBUser; +import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxMerchantBUserService; import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,6 +25,21 @@ public class WxMerchantBUserController extends BaseController { @Autowired private WxMerchantBUserService wxMerchantBUserService; + @ApiOperation("分页列表接口") + @GetMapping("listVo") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "商户-列表") + public ResultData listVo(@ModelAttribute WxMerchantBUser wxMerchantBUser, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxMerchantBUserController::list"); + if (null == wxMerchantBUser) wxMerchantBUser = new WxMerchantBUser(); + wxMerchantBUser.updateTenantInfo(getTenantInfo()); + wxMerchantBUser.setSortColumns(BaseEntity.SortField.CreateDate_DESC); + final PageInfo page = wxMerchantBUserService.listAsPage(wxMerchantBUser, pageNum, pageSize); + return new ResultData(page); + } + @ApiOperation("手机号是否存在") @GetMapping("/hasphone") @ApiImplicitParam(name = "phone", value = "phone", dataType = "String", paramType = "query", required = true) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index c4fa93c1f..a7c359f88 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -47,6 +47,9 @@ public class WxMerchant extends TenantEntity { @TableField(exist = false) private List users; + @TableField(exist = false) + private List otherMerchantUsers; + @TableField(exist = false) private Long rentContractId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index a0362a648..b02bcb433 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -1,13 +1,16 @@ package com.iformall.domain.po; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import com.iformall.utils.Constant; import lombok.Data; import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; @@ -28,6 +31,8 @@ public class WxMerchantBUser extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") private Long merchantId; @TableField(exist = false) + private String merchantName; + @TableField(exist = false) private List merchantIds; @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") private Date createDate; @@ -47,9 +52,12 @@ public class WxMerchantBUser extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "是否是管理员", name = "isAdmin") private Integer isAdmin; - @io.swagger.annotations.ApiModelProperty(value = "可核销其他商户", name = "otherMerchant") + @io.swagger.annotations.ApiModelProperty(value = "json 可核销其他商户", name = "otherMerchant") private String otherMerchant; + @TableField(exist = false) + private String otherMerchantId; + @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value = "b用户ID", name = "buserId") private transient Long buserId; @@ -65,4 +73,13 @@ public class WxMerchantBUser extends TenantEntity { } return this.token; } + + public List getOtherMerchantIds(){ + if(StringUtils.isNotBlank(otherMerchant)){ + try{ + return JSONObject.parseArray(otherMerchant, String.class); + }catch(Exception e){} + } + return new ArrayList(); + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java index 3910709b6..5b8b805ee 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantBUserMapper.java @@ -4,6 +4,7 @@ import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.vo.WxMerchantBuInfoVo; +import org.apache.ibatis.annotations.Param; public interface WxMerchantBUserMapper extends CommonMapper { @@ -18,7 +19,8 @@ public interface WxMerchantBUserMapper extends CommonMapper findSelMerchantList(WxMerchantBUser wxMerchantBUser); WxMerchantBUser findByToken(String token); - - - + + int deleteOtherMerchant(@Param("tenantId")String tenantId, @Param("otherId")String otherId); + + int addOtherMerchant(@Param("tenantId")String tenantId, @Param("ids")List ids, @Param("otherId")String otherId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index 07d9735d8..5086d55ee 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -7,22 +7,27 @@ import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxMerchantBuInfoVo; import com.iformall.enums.EnumMerchantBUserStatus; +import com.iformall.enums.EnumMerchantStatus; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxMerchantBUserMapper; +import com.iformall.mapper.WxMerchantMapper; import com.iformall.mapper.WxMsgValidationcodeMapper; import com.iformall.service.WxMerchantBUserService; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -37,6 +42,9 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { @Autowired WxAppinfoMapper wxAppinfoMapper; + @Autowired + WxMerchantMapper wxMerchantMapper; + @Autowired WxMerchantBUserMapper wxMerchantBUserMapper; @@ -45,7 +53,38 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { @Override public PageInfo listAsPage(WxMerchantBUser record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantBUserMapper.findList(record)); + //查询有效门店的员工 + WxMerchant merchantQ1 = new WxMerchant(); + merchantQ1.updateTenantInfo(record); + merchantQ1.setName(record.getMerchantName()); + merchantQ1.setStatus(EnumMerchantStatus.VALID.getCode()); + List merchantIdList = wxMerchantMapper.findIdList(merchantQ1); + if(merchantIdList == null || merchantIdList.isEmpty()){ + return new PageInfo(); + } + record.setMerchantIds(merchantIdList); + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantBUserMapper.findList(record)); + List list = pageInfo.getList(); + if(list != null && !list.isEmpty()){ + Map merchantSimpleMap = new HashMap(); + if (null != merchantIdList && merchantIdList.size() > 0) { + WxMerchant merchantQ = new WxMerchant(); + merchantQ.updateTenantInfo(record); + merchantQ.setIds(merchantIdList); + List merchantList = wxMerchantMapper.findIdNameList(merchantQ); + if (null != merchantList) { + for (int k = 0 ; k < merchantList.size() ; k++) { + WxMerchant m = merchantList.get(k); + merchantSimpleMap.put(m.getId(), m.getName()); + } + } + } + for (WxMerchantBUser bUser:list) { + bUser.setMerchantName(merchantSimpleMap.get(bUser.getMerchantId())); + } + } + + return pageInfo; } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 3d252494c..9bbbf5e75 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -323,6 +323,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { List userList = wxMerchantBUserMapper.findList(wxMerchantBUser); wxMerchant.setUsers(userList); + if(EnumYesOrNo.YES.getCode().equals(wxMerchant.getIsAdmin())){ + WxMerchantBUser otherQ = new WxMerchantBUser(); + otherQ.setOtherMerchantId(wxMerchant.getId().toString()); + otherQ.setStatus(EnumMerchantBUserStatus.VALID.getCode()); + List otherUserList = wxMerchantBUserMapper.findList(otherQ); + wxMerchant.setOtherMerchantUsers(otherUserList); + } + //分账信息 WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant,EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT); if (receiver != null) { @@ -815,6 +823,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantBUser.setStatus(EnumMerchantBUserStatus.INVALID.getCode()); wxMerchantBUserMapper.updateById(wxMerchantBUser); } + //删除关联的其他门店用户 + wxMerchantBUserMapper.deleteOtherMerchant(wxMerchant.getTenantId(),wxMerchant.getId().toString()); + final IdWorker idWorker = IdWorker.get(); //保存商户关联用户 for (WxMerchantBUser user : users) { @@ -839,6 +850,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchantBUserMapper.updateById(user); } } + if(EnumYesOrNo.YES.getCode().equals(wxMerchant.getIsAdmin())){ + List otherMerchantUsers = wxMerchant.getOtherMerchantUsers(); + if(otherMerchantUsers != null && !otherMerchantUsers.isEmpty()){ + List ids = otherMerchantUsers.stream().map(u -> u.getId()).collect(Collectors.toList()); + wxMerchantBUserMapper.addOtherMerchant(wxMerchant.getTenantId(),ids,wxMerchant.getId().toString()); + } + } return new ResultData(Result.SUCCESS, "账号操作成功"); } catch (Exception e) { logger.error("db failed: 账号操作失败, e:" + e.getMessage()); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 25e992bdd..e122514fb 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -83,6 +83,9 @@ and `is_admin` = #{isAdmin} + + and json_search(other_merchant, 'one', #{otherMerchantId}) IS NOT NULL; + and id in @@ -171,5 +174,20 @@ where `token` = #{token} + + update wx_merchant_b_user set other_merchant = JSON_REMOVE(other_merchant, replace(json_search(other_merchant, 'one', #{otherId}), '"', '')) + where `tenant_id` = #{tenantId} + and json_search(other_merchant, 'one', #{otherId}) IS NOT NULL; + + + + update wx_merchant_b_user set other_merchant = json_array_append(coalesce(other_merchant,'[]'), '$', #{otherId}) + where `tenant_id` = #{tenantId} + and id in + + #{idItem} + + and json_search(other_merchant, 'one', #{otherId}) IS NULL; + From 235fe7dddc67d1b7b7fd2c0461afea249b8005b2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 5 Aug 2022 14:22:52 +0800 Subject: [PATCH 2/4] // merchant --- .../java/com/iformall/domain/po/WxMerchantBUser.java | 2 ++ .../service/impl/WxMerchantBUserServiceImpl.java | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java index b02bcb433..328dfd5c3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java @@ -34,6 +34,8 @@ public class WxMerchantBUser extends TenantEntity { private String merchantName; @TableField(exist = false) private List merchantIds; + @TableField(exist = false) + private Long notMerchantId; @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index 5086d55ee..53b884613 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -26,10 +26,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -58,6 +55,11 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { merchantQ1.updateTenantInfo(record); merchantQ1.setName(record.getMerchantName()); merchantQ1.setStatus(EnumMerchantStatus.VALID.getCode()); + if(record.getNotMerchantId() != null){ + List notIds = new ArrayList<>(); + notIds.add(record.getNotMerchantId()); + merchantQ1.setNotInids(notIds); + } List merchantIdList = wxMerchantMapper.findIdList(merchantQ1); if(merchantIdList == null || merchantIdList.isEmpty()){ return new PageInfo(); From bf29af1511723ebe4dfeb9617b3b4095e173978b Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 5 Aug 2022 15:57:12 +0800 Subject: [PATCH 3/4] // merchant --- .../iformall/service/WxMerchantService.java | 5 ++-- .../service/impl/WxMerchantServiceImpl.java | 27 +++++++++++++++++++ .../mapper/WxMerchantBUserMapper.xml | 2 +- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 24e523edc..aae83982c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -67,8 +67,9 @@ public interface WxMerchantService { PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize); List queryIdAndNames(WxMerchant record); - - + + Map getIdAndNamesMap(WxMerchant record); + PageInfo listAsPageCVo(WxMerchantDto wxMerchantDto, Integer pageIndex, Integer pageSize,boolean hasShop); /** * 根据code查询 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 9bbbf5e75..b0519c5e6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -161,6 +161,19 @@ public class WxMerchantServiceImpl implements WxMerchantService { return wxMerchantMapper.findIdNameList(record); } + @Override + public Map getIdAndNamesMap(WxMerchant record) { + Map merchantSimpleMap = new HashMap(); + List merchantList = wxMerchantMapper.findIdNameList(record); + if (null != merchantList && !merchantList.isEmpty()) { + for (int k = 0 ; k < merchantList.size() ; k++) { + WxMerchant m = merchantList.get(k); + merchantSimpleMap.put(m.getId(), m.getName()); + } + } + return merchantSimpleMap; + } + @Override public WxMerchantVo getMerchantInfo(HashMap params) { WxMerchant merchant = wxMerchantMapper.getMerchantByCode(params); @@ -328,6 +341,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { otherQ.setOtherMerchantId(wxMerchant.getId().toString()); otherQ.setStatus(EnumMerchantBUserStatus.VALID.getCode()); List otherUserList = wxMerchantBUserMapper.findList(otherQ); + if(otherUserList != null && !otherUserList.isEmpty()){ + List ids = otherUserList.stream().map(u -> u.getMerchantId()).collect(Collectors.toList()); + WxMerchant merchantQ = new WxMerchant(); + merchantQ.updateTenantInfo(wxMerchant); + merchantQ.setIds(ids); + Map idAndNamesMap = getIdAndNamesMap(merchantQ); + for (WxMerchantBUser buser: otherUserList) { + buser.setMerchantName(idAndNamesMap.get(buser.getMerchantId())); + } + } wxMerchant.setOtherMerchantUsers(otherUserList); } @@ -870,6 +893,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (wxMerchant.getId() == null) { return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); } + if(EnumYesOrNo.NO.getCode().equals(wxMerchant.getIsAdmin())){ + //删除关联的其他门店用户 + wxMerchantBUserMapper.deleteOtherMerchant(wxMerchant.getTenantId(),wxMerchant.getId().toString()); + } wxMerchantMapper.updateById(wxMerchant); wxLevelConfigService.batchSaveByMerchantId(wxMerchant, wxMerchant.getId(), wxMerchant.getLevelConfigList()); } catch (Exception e) { diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index e122514fb..ba745d56e 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -180,7 +180,7 @@ and json_search(other_merchant, 'one', #{otherId}) IS NOT NULL; - + update wx_merchant_b_user set other_merchant = json_array_append(coalesce(other_merchant,'[]'), '$', #{otherId}) where `tenant_id` = #{tenantId} and id in From 1f9645bbb3c1083e0cdc45defd10b95ea6d92483 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 5 Aug 2022 17:31:41 +0800 Subject: [PATCH 4/4] // test --- .../iformall/domain/vo/WxCouponOrderBVo.java | 21 ++++++- .../impl/WxCouponOrderServiceImpl.java | 56 ++++++++++--------- 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index ab0343d1d..eb714c537 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -156,8 +156,27 @@ public class WxCouponOrderBVo extends WxCouponOrder { @Excel(name = "b端核销手机号", width = 50, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="b端核销手机号",name="bUserPhone") private String bUserPhone; + + public String getbMerchantName() { + return bMerchantName; + } + + public void setbMerchantName(String bMerchantName) { + this.bMerchantName = bMerchantName; + } + + public String getbmerchantName() { + return bMerchantName; + } + + public void setbmerchantName(String bMerchantName) { + this.bMerchantName = bMerchantName; + } + + private String bMerchantName; + @Excel(name = "所属商户", width = 50, orderNum = "3") - @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") + @io.swagger.annotations.ApiModelProperty(value="所属商户",name="merchantName") private String merchantName; @TableField(exist = false) private List bUserIdList; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 5516e0d17..b65192d24 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -493,11 +493,18 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { if (null != b) { bvo.setbUserName(b.getName()); bvo.setbUserPhone(b.getPhone()); - WxMerchant merchant = merchantSimpleMap.get(b.getMerchantId()); - if (null != merchant) { - bvo.setMerchantName(merchant.getName()); - bvo.setMerchantId(merchant.getId()); - } +// WxMerchant merchant = merchantSimpleMap.get(b.getMerchantId()); +// if (null != merchant) { +// bvo.setMerchantName(merchant.getName()); +// bvo.setMerchantId(merchant.getId()); +// } + } + } + if (null != bvo.getBMerchantId()) { + WxMerchant merchant = merchantSimpleMap.get(bvo.getBMerchantId()); + if (null != merchant) { + bvo.setbMerchantName(merchant.getName()); +// bvo.setVerifyMerchantName(merchant.getName()); } } if (null != bvo.getCUserId()) { @@ -841,8 +848,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { private List handleQueryResult(boolean cUserEntry,List list,TenantEntity tenantEntity) { if (null != list && list.size() > 0) { - - + //循环list,获取 cUserId List cUserIdList = new ArrayList(); List bUserIdList = new ArrayList(); @@ -965,22 +971,22 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { co.setSourceType(coupon.getSourceType()); } - co.setSubsidyNum(co.getSubsidy()); - - if(co.getBMerchantId() == null){ - Long merchanId = merchantProductIdMap.get(co.getCouponId()); - if (null != merchanId) { - if (merchanId == -999L) { - co.setMerchantName("多商户通用"); - co.setMerchantId(0L); - }else { - co.setMerchantName(merchantNameMap.get(merchanId)); - co.setMerchantId(merchanId); - } + co.setSubsidyNum(co.getSubsidy()); + + Long merchanId = merchantProductIdMap.get(co.getCouponId()); + if (null != merchanId) { + if (merchanId == -999L) { + co.setMerchantName("多商户通用"); + co.setMerchantId(0L); + }else { + co.setMerchantName(merchantNameMap.get(merchanId)); + co.setMerchantId(merchanId); } - }else{ - co.setMerchantName(merchantNameMap.get(co.getBMerchantId())); - co.setMerchantId(co.getBMerchantId()); + } + + if(co.getBMerchantId() != null){ + co.setbMerchantName(merchantNameMap.get(co.getBMerchantId())); + co.setVerifyMerchantName(merchantNameMap.get(co.getBMerchantId())); } @@ -994,11 +1000,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { co.setUserNickName("保密"); } } - - Long bMechantId = co.getBMerchantId(); - if (null != bMechantId) { - co.setVerifyMerchantName(merchantNameMap.get(bMechantId)); - } + //co.setChannelType();) if(null != co.getBUserId()){ WxMerchantBUser buser = buserPhoneMap.get(co.getBUserId());