| @@ -18,6 +18,8 @@ public class WxMerchantShop extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| @TableField(exist = false) | |||||
| private List<Long> merchantIds; | |||||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | ||||
| private Long shopId; | private Long shopId; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @@ -64,5 +64,4 @@ public interface WxMerchantMapper extends CommonMapper<WxMerchant, Long> { | |||||
| List<Map<String, Object>> detailByShopId(@Param("tenantInfo")TenantEntity tenantInfo,@Param("shopId") Long shopId); | List<Map<String, Object>> detailByShopId(@Param("tenantInfo")TenantEntity tenantInfo,@Param("shopId") Long shopId); | ||||
| List<WxMerchantVo> newFindListCVo(@Param("tenantId")String tenantId, @Param("merchantIds")List<Long> merchantIds); | |||||
| } | } | ||||
| @@ -13,7 +13,7 @@ public interface WxMerchantShopMapper extends CommonMapper<WxMerchantShop, Strin | |||||
| List<Long> findMerchantIdList(WxMerchantShop wxMerchantShop); | List<Long> findMerchantIdList(WxMerchantShop wxMerchantShop); | ||||
| List<Long> findShopIds(@Param("merchantId") Long merchantId); | |||||
| List<Long> findShopIds(@Param("merchantIds") List<Long> merchantIds); | |||||
| void delShops(@Param("merchantId") Long merchantId,@Param("shopList") List<Long> shopIds); | void delShops(@Param("merchantId") Long merchantId,@Param("shopList") List<Long> shopIds); | ||||
| @@ -155,8 +155,8 @@ public interface WxMerchantService { | |||||
| PageInfo<WxMerchant> listVoAsPage(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); | PageInfo<WxMerchant> listVoAsPage(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); | ||||
| List<WxMerchantVo> findMerchantVoList(Long couponId,String tenantId); | |||||
| Map<Long,List<WxMerchantVo>> findCouponMerchantVoList(List<Long> couponIds,String tenantId); | |||||
| List<WxMerchantVo> findMerchantVoList(Long couponId,TenantEntity tenantEntity,boolean hasShop); | |||||
| Map<Long,List<WxMerchantVo>> findCouponMerchantVoList(List<Long> couponIds,TenantEntity tenantEntity,boolean hasShop); | |||||
| PageInfo<WxMerchant> listVoAsPage2(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); | PageInfo<WxMerchant> listVoAsPage2(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); | ||||
| @@ -189,7 +189,4 @@ public interface WxMerchantService { | |||||
| Map<String, Object> detailByShopId(TenantEntity tenantInfo, Long shopId); | Map<String, Object> detailByShopId(TenantEntity tenantInfo, Long shopId); | ||||
| List<WxMerchantVo> newFindWithShopByCouponId(TenantEntity tenantInfo, Long couponId); | |||||
| List<WxMerchantVo> newFindByCouponId(TenantEntity tenantInfo, Long couponId); | |||||
| } | } | ||||
| @@ -93,5 +93,5 @@ public interface WxShopService { | |||||
| * @param merchantId | * @param merchantId | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| List<WxShopVo> newFindByMerchantId(String tenantId, Long merchantId); | |||||
| Map<Long,List<WxShopVo>> findMerchantShopVoList(TenantEntity tenantEntity, List<Long> merchantIds); | |||||
| } | } | ||||
| @@ -622,10 +622,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| couponQ.updateTenantInfo(co); | couponQ.updateTenantInfo(co); | ||||
| couponQ.setId(co.getCouponId()); | couponQ.setId(co.getCouponId()); | ||||
| WxCoupon coupon = wxCouponMapper.findSimpleDetail(couponQ); | WxCoupon coupon = wxCouponMapper.findSimpleDetail(couponQ); | ||||
| return getCouponOrderCDetailVo(co,coupon); | |||||
| List<Long> couponIds = new ArrayList<Long>(); | |||||
| couponIds.add(co.getCouponId()); | |||||
| Map<Long, List<WxMerchantVo>> couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIds, co, true); | |||||
| return getCouponOrderCDetailVo(co,coupon,couponMerchantVoMap); | |||||
| } | } | ||||
| private WxCouponOrderCVo getCouponOrderCDetailVo(WxCouponOrder co,WxCoupon coupon) { | |||||
| private WxCouponOrderCVo getCouponOrderCDetailVo(WxCouponOrder co,WxCoupon coupon,Map<Long, List<WxMerchantVo>> couponMerchantVoMap) { | |||||
| try { | try { | ||||
| WxCouponOrderCVo cvo = new WxCouponOrderCVo(); | WxCouponOrderCVo cvo = new WxCouponOrderCVo(); | ||||
| BeanUtils.copyProperties(cvo, co); | BeanUtils.copyProperties(cvo, co); | ||||
| @@ -648,7 +651,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| cvo.setPickStartDate(coupon.getPickStartDate()); | cvo.setPickStartDate(coupon.getPickStartDate()); | ||||
| cvo.setPickEndDate(coupon.getPickEndDate()); | cvo.setPickEndDate(coupon.getPickEndDate()); | ||||
| cvo.setAutoRefund(coupon.getAutoRefund()); | cvo.setAutoRefund(coupon.getAutoRefund()); | ||||
| cvo.setMerchantVoList(wxMerchantService.newFindWithShopByCouponId(cvo,coupon.getId())); | |||||
| cvo.setMerchantVoList(couponMerchantVoMap.get(cvo.getCouponId())); | |||||
| } | } | ||||
| return cvo; | return cvo; | ||||
| } catch (IllegalAccessException | InvocationTargetException e) { | } catch (IllegalAccessException | InvocationTargetException e) { | ||||
| @@ -657,6 +660,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| return null; | return null; | ||||
| } | } | ||||
| private WxCouponOrderCVo getCouponOrderCDetailVo(WxCouponOrder co,WxCoupon coupon) { | |||||
| List<Long> couponIds = new ArrayList<Long>(); | |||||
| couponIds.add(co.getCouponId()); | |||||
| Map<Long, List<WxMerchantVo>> couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(null, co, true); | |||||
| return getCouponOrderCDetailVo(co,coupon,couponMerchantVoMap); | |||||
| } | |||||
| @Override | @Override | ||||
| public WxCouponOrderCVo detailCUserVo(String couponOrderId,TenantEntity tenantinfo) { | public WxCouponOrderCVo detailCUserVo(String couponOrderId,TenantEntity tenantinfo) { | ||||
| WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfCUser(Long.valueOf(couponOrderId),tenantinfo.getTenantId()); | WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfCUser(Long.valueOf(couponOrderId),tenantinfo.getTenantId()); | ||||
| @@ -751,7 +761,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| } | } | ||||
| Map<Long, List<WxMerchantVo>> couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIds, tenantEntity.getTenantId()); | |||||
| Map<Long, List<WxMerchantVo>> couponMerchantVoMap = wxMerchantService.findCouponMerchantVoList(couponIds, tenantEntity,false); | |||||
| List<WxCouponOrderCarCVo> volist = new ArrayList<WxCouponOrderCarCVo>(); | List<WxCouponOrderCarCVo> volist = new ArrayList<WxCouponOrderCarCVo>(); | ||||
| for (int i = 0 ; i < couponOrderList.size(); i++){ | for (int i = 0 ; i < couponOrderList.size(); i++){ | ||||
| @@ -787,7 +797,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| cvo.setValidStartDate(coupon.getValidStartDate()); | cvo.setValidStartDate(coupon.getValidStartDate()); | ||||
| cvo.setValidEndDate(coupon.getValidEndDate()); | cvo.setValidEndDate(coupon.getValidEndDate()); | ||||
| cvo.setAutoRefund(coupon.getAutoRefund()); | cvo.setAutoRefund(coupon.getAutoRefund()); | ||||
| cvo.setMerchantVoList(wxMerchantService.newFindByCouponId(cvo,coupon.getId())); | |||||
| } | } | ||||
| WxCouponCar couponCar= couponCarMap.get(cvo.getCouponId()); | WxCouponCar couponCar= couponCarMap.get(cvo.getCouponId()); | ||||
| if (null != couponCar) { | if (null != couponCar) { | ||||
| @@ -116,11 +116,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| @Autowired | @Autowired | ||||
| TtUserFollowMapper ttUserFollowMapper; | TtUserFollowMapper ttUserFollowMapper; | ||||
| @Autowired | |||||
| WxMallFloorService wxMallFloorService; | |||||
| @Autowired | |||||
| WxMallBuildingService wxMallBuildingService; | |||||
| @Autowired | @Autowired | ||||
| private QrCodeService qrCodeService; | private QrCodeService qrCodeService; | ||||
| @@ -517,7 +512,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| List<Long> shopIds = wxMerchant.getShopids(); | List<Long> shopIds = wxMerchant.getShopids(); | ||||
| if(null != shopIds && shopIds.size() > 0){ | if(null != shopIds && shopIds.size() > 0){ | ||||
| //如果原来店铺在商户里面有有效的合同,则不能操作 | //如果原来店铺在商户里面有有效的合同,则不能操作 | ||||
| List<Long> oldShopIds = wxMerchantShopMapper.findShopIds(wxMerchant.getId()); | |||||
| List<Long> merchantIds = new ArrayList<Long>(); | |||||
| merchantIds.add(wxMerchant.getId()); | |||||
| List<Long> oldShopIds = wxMerchantShopMapper.findShopIds(merchantIds); | |||||
| List<Long> coldShopIds = new ArrayList<Long>(); | List<Long> coldShopIds = new ArrayList<Long>(); | ||||
| if (null != oldShopIds && oldShopIds.size() > 0) { | if (null != oldShopIds && oldShopIds.size() > 0) { | ||||
| coldShopIds.addAll(oldShopIds); | coldShopIds.addAll(oldShopIds); | ||||
| @@ -925,11 +922,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public Map<Long,List<WxMerchantVo>> findCouponMerchantVoList(List<Long> couponIds,String tenantId) { | |||||
| List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(tenantId, couponIds); | |||||
| public Map<Long,List<WxMerchantVo>> findCouponMerchantVoList(List<Long> couponIds,TenantEntity tenantEntity,boolean hasShop) { | |||||
| List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(tenantEntity.getTenantId(), couponIds); | |||||
| if(null != merchantIds && merchantIds.size() > 0 ) { | if(null != merchantIds && merchantIds.size() > 0 ) { | ||||
| WxMerchant merchantQ = new WxMerchant(); | WxMerchant merchantQ = new WxMerchant(); | ||||
| merchantQ.setTenantId(tenantId); | |||||
| merchantQ.updateTenantInfo(tenantEntity); | |||||
| merchantQ.setIds(merchantIds); | merchantQ.setIds(merchantIds); | ||||
| List<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ); | List<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ); | ||||
| Map<Long,WxMerchant> merchantMap = new HashMap<Long,WxMerchant>(); | Map<Long,WxMerchant> merchantMap = new HashMap<Long,WxMerchant>(); | ||||
| @@ -943,13 +940,19 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| } | } | ||||
| WxCouponMerchant couponMerchantQ = new WxCouponMerchant(); | WxCouponMerchant couponMerchantQ = new WxCouponMerchant(); | ||||
| couponMerchantQ.setTenantId(tenantId); | |||||
| couponMerchantQ.updateTenantInfo(tenantEntity); | |||||
| couponMerchantQ.setStatus(0); | couponMerchantQ.setStatus(0); | ||||
| couponMerchantQ.setProductIds(couponIds); | couponMerchantQ.setProductIds(couponIds); | ||||
| List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(couponMerchantQ); | List<WxCouponMerchant> couponMerchantList = wxCouponMerchantMapper.findList(couponMerchantQ); | ||||
| if (null == couponMerchantList) { | if (null == couponMerchantList) { | ||||
| return null; | return null; | ||||
| } | } | ||||
| Map<Long,List<WxShopVo>> merchantShopVoList = null; | |||||
| if (hasShop) { | |||||
| merchantShopVoList = wxShopService.findMerchantShopVoList(tenantEntity,merchantIds); | |||||
| } | |||||
| Map<Long,List<WxMerchantVo>> retMap = new HashMap<Long,List<WxMerchantVo>>(); | Map<Long,List<WxMerchantVo>> retMap = new HashMap<Long,List<WxMerchantVo>>(); | ||||
| for (int i = 0 ; i < couponMerchantList.size() ; i ++) { | for (int i = 0 ; i < couponMerchantList.size() ; i ++) { | ||||
| WxCouponMerchant cm = couponMerchantList.get(i); | WxCouponMerchant cm = couponMerchantList.get(i); | ||||
| @@ -961,7 +964,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| volist = new ArrayList<WxMerchantVo>(); | volist = new ArrayList<WxMerchantVo>(); | ||||
| } | } | ||||
| retMap.put(couponId, volist); | retMap.put(couponId, volist); | ||||
| WxMerchantVo vo = merchantToVo(cm,merchantMap.get(merchantId)); | |||||
| WxMerchantVo vo = merchantToVo(cm,merchantMap.get(merchantId),hasShop,merchantShopVoList); | |||||
| if (null != vo) { | if (null != vo) { | ||||
| volist.add(vo); | volist.add(vo); | ||||
| } | } | ||||
| @@ -972,7 +975,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| return null; | return null; | ||||
| } | } | ||||
| private WxMerchantVo merchantToVo(WxCouponMerchant cm,WxMerchant m) { | |||||
| private WxMerchantVo merchantToVo(WxCouponMerchant cm,WxMerchant m,boolean hasShop,Map<Long,List<WxShopVo>> merchantShopVoList) { | |||||
| if (null == cm) { | if (null == cm) { | ||||
| return null; | return null; | ||||
| } | } | ||||
| @@ -991,14 +994,17 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| vo.setSubBusinessId(m.getSubBusinessId()); | vo.setSubBusinessId(m.getSubBusinessId()); | ||||
| vo.setParameter(cm.getParameter()); | vo.setParameter(cm.getParameter()); | ||||
| vo.setLinkLinePhone(m.getLinkLinePhone()); | vo.setLinkLinePhone(m.getLinkLinePhone()); | ||||
| if (hasShop) { | |||||
| vo.setShopVoList(merchantShopVoList.get(vo.getId())); | |||||
| } | |||||
| return vo; | return vo; | ||||
| } | } | ||||
| @Override | @Override | ||||
| public List<WxMerchantVo> findMerchantVoList(Long couponId,String tenantId) { | |||||
| public List<WxMerchantVo> findMerchantVoList(Long couponId,TenantEntity tenantEntity,boolean hasShop) { | |||||
| List<Long> couponIds = new ArrayList<Long>(); | List<Long> couponIds = new ArrayList<Long>(); | ||||
| couponIds.add(couponId); | couponIds.add(couponId); | ||||
| Map<Long,List<WxMerchantVo>> couponMerchantVoList = findCouponMerchantVoList(couponIds,tenantId); | |||||
| Map<Long,List<WxMerchantVo>> couponMerchantVoList = findCouponMerchantVoList(couponIds,tenantEntity,hasShop); | |||||
| if (null != couponMerchantVoList) { | if (null != couponMerchantVoList) { | ||||
| return couponMerchantVoList.get(couponId); | return couponMerchantVoList.get(couponId); | ||||
| } | } | ||||
| @@ -1063,7 +1069,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| @Override | @Override | ||||
| public List<Long> getMerchantShopIds(Long merchantId) { | public List<Long> getMerchantShopIds(Long merchantId) { | ||||
| return wxMerchantShopMapper.findShopIds(merchantId); | |||||
| List<Long> merchantIds = new ArrayList<Long>(); | |||||
| merchantIds.add(merchantId); | |||||
| return wxMerchantShopMapper.findShopIds(merchantIds); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -1271,35 +1279,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| return null; | return null; | ||||
| } | } | ||||
| @Override | |||||
| public List<WxMerchantVo> newFindWithShopByCouponId(TenantEntity tenantInfo, Long couponId) { | |||||
| List<WxMerchantVo> wxMerchantVoList = this.newFindByCouponId(tenantInfo, couponId); | |||||
| handleShopVo(tenantInfo,wxMerchantVoList); | |||||
| return wxMerchantVoList; | |||||
| } | |||||
| @Override | |||||
| public List<WxMerchantVo> newFindByCouponId(TenantEntity tenantInfo, Long couponId) { | |||||
| List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductId(tenantInfo.getTenantId(), couponId); | |||||
| List<WxMerchantVo> wxMerchantVoList = wxMerchantMapper.newFindListCVo(tenantInfo.getTenantId(),merchantIds); | |||||
| return wxMerchantVoList; | |||||
| } | |||||
| private void handleShopVo(TenantEntity tenantInfo,List<WxMerchantVo> wxMerchantVoList){ | |||||
| if(wxMerchantVoList != null && wxMerchantVoList.size() > 0){ | |||||
| Map<Long,String> floorMap = wxMallFloorService.getFloorMap(tenantInfo); | |||||
| Map<Long,String> buildingMap = wxMallBuildingService.getBuildingMap(tenantInfo); | |||||
| for (WxMerchantVo wv:wxMerchantVoList) { | |||||
| List<WxShopVo> shopVoList = wxShopService.newFindByMerchantId(tenantInfo.getTenantId(),wv.getId()); | |||||
| if(shopVoList != null && shopVoList.size() > 0){ | |||||
| for (WxShopVo sv:shopVoList) { | |||||
| sv.setBuildingName(buildingMap.get(sv.getBuilding())); | |||||
| sv.setFloorName(floorMap.get(sv.getFloor())); | |||||
| } | |||||
| } | |||||
| wv.setShopVoList(shopVoList); | |||||
| } | |||||
| } | |||||
| } | |||||
| } | } | ||||
| @@ -18,12 +18,15 @@ import com.iformall.mapper.WxMerchantShopMapper; | |||||
| import com.iformall.mapper.WxRentContractMapper; | import com.iformall.mapper.WxRentContractMapper; | ||||
| import com.iformall.mapper.WxShopMapper; | import com.iformall.mapper.WxShopMapper; | ||||
| import com.iformall.service.ExcelService; | import com.iformall.service.ExcelService; | ||||
| import com.iformall.service.WxMallBuildingService; | |||||
| import com.iformall.service.WxMallFloorService; | |||||
| import com.iformall.service.WxShopService; | import com.iformall.service.WxShopService; | ||||
| import org.apache.commons.collections.CollectionUtils; | import org.apache.commons.collections.CollectionUtils; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.context.annotation.Lazy; | |||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| @@ -46,6 +49,14 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| @Autowired | @Autowired | ||||
| WxRentContractMapper wxRentContractMapper; | WxRentContractMapper wxRentContractMapper; | ||||
| @Lazy | |||||
| @Autowired | |||||
| WxMallFloorService wxMallFloorService; | |||||
| @Lazy | |||||
| @Autowired | |||||
| WxMallBuildingService wxMallBuildingService; | |||||
| @Override | @Override | ||||
| public List<WxShop> selectList(QueryWrapper<WxShop> queryWrapper) { | public List<WxShop> selectList(QueryWrapper<WxShop> queryWrapper) { | ||||
| @@ -262,9 +273,40 @@ public class WxShopServiceImpl implements WxShopService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public List<WxShopVo> newFindByMerchantId(String tenantId, Long merchantId) { | |||||
| List<Long> shopIds = wxMerchantShopMapper.findShopIds(merchantId); | |||||
| List<WxShopVo> shopVoList = wxShopMapper.newFindShopVoList(tenantId,shopIds); | |||||
| return shopVoList; | |||||
| public Map<Long,List<WxShopVo>> findMerchantShopVoList(TenantEntity tenantEntity, List<Long> merchantIds) { | |||||
| Map<Long,String> floorMap = wxMallFloorService.getFloorMap(tenantEntity); | |||||
| Map<Long,String> buildingMap = wxMallBuildingService.getBuildingMap(tenantEntity); | |||||
| List<Long> shopIds = wxMerchantShopMapper.findShopIds(merchantIds); | |||||
| List<WxShopVo> shopVoList = wxShopMapper.newFindShopVoList(tenantEntity.getTenantId(),shopIds); | |||||
| Map<Long,WxShopVo> shopVoMap = new HashMap<Long,WxShopVo>(); | |||||
| if(shopVoList != null && shopVoList.size() > 0){ | |||||
| for (WxShopVo sv:shopVoList) { | |||||
| sv.setBuildingName(buildingMap.get(sv.getBuilding())); | |||||
| sv.setFloorName(floorMap.get(sv.getFloor())); | |||||
| shopVoMap.put(sv.getId(), sv); | |||||
| } | |||||
| } | |||||
| Map<Long,List<WxShopVo>> retMap = new HashMap<Long,List<WxShopVo>>(); | |||||
| WxMerchantShop merchantShopQ = new WxMerchantShop(); | |||||
| merchantShopQ.updateTenantInfo(tenantEntity); | |||||
| merchantShopQ.setMerchantIds(merchantIds); | |||||
| List<WxMerchantShop> merchantShops = wxMerchantShopMapper.findList(merchantShopQ); | |||||
| if (null == merchantShops) { | |||||
| return null; | |||||
| } | |||||
| for (int i = 0 ; i < merchantShops.size(); i ++) { | |||||
| WxMerchantShop ms = merchantShops.get(i); | |||||
| if (null != ms.getShopId() && null != ms.getMerchantId()) { | |||||
| List<WxShopVo> mShopIds = retMap.get(ms.getMerchantId()); | |||||
| if (null == mShopIds) { | |||||
| mShopIds = new ArrayList<WxShopVo>(); | |||||
| } | |||||
| mShopIds.add(shopVoMap.get(ms.getShopId())); | |||||
| retMap.put(ms.getMerchantId(), mShopIds); | |||||
| } | |||||
| } | |||||
| return retMap; | |||||
| } | } | ||||
| } | } | ||||
| @@ -753,22 +753,4 @@ | |||||
| and s.`id` = #{shopId} | and s.`id` = #{shopId} | ||||
| </select> | </select> | ||||
| <select id="newFindListCVo" parameterType="hashmap" resultType="com.iformall.domain.vo.WxMerchantVo"> | |||||
| select | |||||
| id,img_url merchantImgUrl,`name` merchantName,link_phone linkPhone,status,business_id businessId | |||||
| FROM wx_merchant | |||||
| where is_del=0 | |||||
| <if test=" null != tenantId and '' != tenantId"> | |||||
| and `tenant_id` = #{tenantId} | |||||
| </if> | |||||
| <if test=" null != merchantIds "> | |||||
| and id in | |||||
| <foreach collection="merchantIds" index="index" item="idItem" open="(" separator="," close=")"> | |||||
| #{idItem} | |||||
| </foreach> | |||||
| </if> | |||||
| order by top_time desc | |||||
| </select> | |||||
| </mapper> | </mapper> | ||||
| @@ -68,6 +68,13 @@ | |||||
| #{shopIdItem} | #{shopIdItem} | ||||
| </foreach> | </foreach> | ||||
| </if> | </if> | ||||
| <if test=" null != merchantIds "> | |||||
| and merchant_id in | |||||
| <foreach collection="merchantIds" index="index" item="merchantIdItem" open="(" separator="," close=")"> | |||||
| #{merchantIdItem} | |||||
| </foreach> | |||||
| </if> | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | <if test=" null != sortColumns"> order by ${sortColumns} </if> | ||||
| </sql> | </sql> | ||||
| @@ -87,7 +94,14 @@ | |||||
| <select id="findShopIds" parameterType="Long" resultType="Long"> | <select id="findShopIds" parameterType="Long" resultType="Long"> | ||||
| select shop_id from wx_merchant_shop where `merchant_id` = #{merchantId} and is_del = 0 | |||||
| select shop_id from wx_merchant_shop where is_del = 0 | |||||
| <if test=" null != merchantIds "> | |||||
| and merchant_id in | |||||
| <foreach collection="merchantIds" index="index" item="merchantIdItem" open="(" separator="," close=")"> | |||||
| #{merchantIdItem} | |||||
| </foreach> | |||||
| </if> | |||||
| </select> | </select> | ||||
| <update id = "delShops" parameterType="java.util.Map"> | <update id = "delShops" parameterType="java.util.Map"> | ||||