czg_team/chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

收银点改bug

Browse Source
This commit is contained in:
liuyingfang
2024-02-20 09:22:46 +08:00
parent c34a5ace57
commit 028a427405
3 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantChannelStatusMapper.java
View File

@@ -54,5 +54,5 @@ public interface MerchantChannelStatusMapper extends BaseMapper<MerchantChannelS
UserNumVO getUserNumInfo(@Param("userId") Long userId, @Param("date")String date, @Param("dateType")Integer dateType); UserNumVO getUserNumInfo(@Param("userId") Long userId, @Param("date")String date, @Param("dateType")Integer dateType);
List<merchantChannelVO> pageDate(@Param("pageSize")Integer size, @Param("offset")Integer page); List<merchantChannelVO> pageDate(@Param("pageSize")Integer size, @Param("offset")Integer page);
List<Integer> getChannelByMerchantCode(@Param("merchantCode") String merchantCode); List<Integer> getChannelByMerchantCode(@Param("merchantCode") String merchantCode,@Param("merchantCodeList") List<String> merchantCodeList);
} }

5
pluss-dao-bundle/src/main/resources/mapper/MerchantChannelStatusMapper.xml
View File

@@ -90,6 +90,9 @@
order by mcs.id desc limit #{pageSize} offset #{offset}; order by mcs.id desc limit #{pageSize} offset #{offset};
</select> </select>
<select id="getChannelByMerchantCode" resultType="java.lang.Integer"> <select id="getChannelByMerchantCode" resultType="java.lang.Integer">
SELECT channel FROM tb_pluss_merchant_channel_status WHERE merchantCode=#{merchantCode} SELECT channel FROM tb_pluss_merchant_channel_status WHERE merchantCode IN
<foreach collection="merchantCodeList" item="item" open="(" close=")" index="index" separator=",">
#{item}
</foreach>
</select> </select>
</mapper> </mapper>

54
pluss-service-bundle/src/main/java/cn/pluss/platform/merchant/impl/MerchantCashPlaceServiceImpl.java
View File

@@ -208,7 +208,19 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
@Override @Override
public List<MerchantChannel> merchantChannel(String merchantCode,List<MerchantChannel> merchantChannels) { public List<MerchantChannel> merchantChannel(String merchantCode,List<MerchantChannel> merchantChannels) {
List<Integer> channelByMerchantCode = channelStatusMapper.getChannelByMerchantCode(merchantCode); List<String> merchantCodes = new ArrayList<>();
if (merchantCode != null){
QueryWrapper<MerchantBaseInfo> qW = new QueryWrapper<>();
qW.eq("masterMerchantCode",merchantCode);
List<MerchantBaseInfo> baseInfo = merchantBaseInfoService.list(qW);
for (MerchantBaseInfo date :baseInfo) {
merchantCodes.add(date.getMerchantCode());
}
merchantCodes.add(merchantCode);
}
List<Integer> channelByMerchantCode = channelStatusMapper.getChannelByMerchantCode(merchantCode,merchantCodes);
for (MerchantChannel data : merchantChannels) { for (MerchantChannel data : merchantChannels) {
for (Integer i :channelByMerchantCode) { for (Integer i :channelByMerchantCode) {
if (data.getId().equals(i)){ if (data.getId().equals(i)){
@@ -370,7 +382,7 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
String merchantCode = merchantBaseInfo.getMerchantCode(); String merchantCode = merchantBaseInfo.getMerchantCode();
QueryWrapper<MerchantBaseInfo> qW = new QueryWrapper<>(); QueryWrapper<MerchantBaseInfo> qW = new QueryWrapper<>();
qW.eq("masterMerchantCode",merchantCode); qW.eq("masterMerchantCode",merchantCode);
qW.like(StringUtils.isNotEmpty(name), "name", merchantBaseInfo.getAlias()); qW.like(StringUtils.isNotEmpty(name), "alias", name);
qW.orderByDesc("id"); qW.orderByDesc("id");
Page<MerchantBaseInfo> merchantBaseInfoPage = merchantBaseInfoMapper.selectPage(page, qW); Page<MerchantBaseInfo> merchantBaseInfoPage = merchantBaseInfoMapper.selectPage(page, qW);
//组装 //组装
@@ -385,26 +397,28 @@ public class MerchantCashPlaceServiceImpl extends ServiceImpl<MerchantCashPlaceM
cashPlaceVO.setTab(data.getTab()); cashPlaceVO.setTab(data.getTab());
cashPlaceVOList.add(cashPlaceVO); cashPlaceVOList.add(cashPlaceVO);
} }
//放入自己 if (name == null) {
MerchantCashPlaceVO cashPlaceVOMy = new MerchantCashPlaceVO(); //放入自己
cashPlaceVOMy.setName(merchantBaseInfo.getAlias()); MerchantCashPlaceVO cashPlaceVOMy = new MerchantCashPlaceVO();
cashPlaceVOMy.setCode(merchantBaseInfo.getMerchantCode()); cashPlaceVOMy.setName(merchantBaseInfo.getAlias());
cashPlaceVOMy.setAddress(merchantBaseInfo.getAddress()); cashPlaceVOMy.setCode(merchantBaseInfo.getMerchantCode());
cashPlaceVOMy.setCreateTime(merchantBaseInfo.getCreateDt()); cashPlaceVOMy.setAddress(merchantBaseInfo.getAddress());
cashPlaceVOMy.setMerchantBaseInfo(merchantBaseInfo); cashPlaceVOMy.setCreateTime(merchantBaseInfo.getCreateDt());
cashPlaceVOMy.setTab(merchantBaseInfo.getTab()); cashPlaceVOMy.setMerchantBaseInfo(merchantBaseInfo);
cashPlaceVOList.add(cashPlaceVOMy); cashPlaceVOMy.setTab(merchantBaseInfo.getTab());
//如果全为0,默认是用户号 cashPlaceVOList.add(cashPlaceVOMy);
boolean allZero = true; //如果全为0,默认是用户号
for (MerchantCashPlaceVO vo : cashPlaceVOList) { boolean allZero = true;
if (vo.getTab() != 0) { for (MerchantCashPlaceVO vo : cashPlaceVOList) {
allZero = false; if (vo.getTab() != 0) {
break; allZero = false;
break;
}
} }
}
if (allZero && !cashPlaceVOList.isEmpty()) { if (allZero && !cashPlaceVOList.isEmpty()) {
cashPlaceVOList.get(cashPlaceVOList.size() - 1).setTab(1); cashPlaceVOList.get(cashPlaceVOList.size() - 1).setTab(1);
}
} }
return cashPlaceVOList; return cashPlaceVOList;
} }