diff --git a/mallinkAdmin/src/main/resources/db/migration/V2022090900001__addmerchant.sql b/mallinkAdmin/src/main/resources/db/migration/V2022090900001__addmerchant.sql new file mode 100644 index 000000000..46ab712e4 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2022090900001__addmerchant.sql @@ -0,0 +1,2 @@ +ALTER TABLE `mallink`.`wx_merchant` +ADD COLUMN `is_private` smallint(2) DEFAULT 0 AFTER `is_public`; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 8dc29aa85..16aa766a8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -56,10 +56,7 @@ public class WxCreditHistoryController extends BaseController { @ApiImplicitParam(name = "userId", value = "会员Id", dataType = "long", paramType = "query", required = true)}) public ResultData findByMerchantIdAndSpend(Long merchantId, String spendStr,Long userId) { log.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend"); - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setStatus(EnumYesOrNo.YES.getCode()); - wxMerchant.setId(getLoginBUser().getMerchantId()); - wxMerchant = wxMerchantService.findOne(wxMerchant); + WxMerchant wxMerchant = wxMerchantService.selectById(getLoginBUser().getMerchantId()); //普通商户只允许查询自己的消费金额所增加的积分 if (EnumMerchantAdmin.PUBLIC_COMMON.getCode().equals(wxMerchant.getIsAdmin()) && merchantId.longValue() != getLoginBUser().getMerchantId().longValue()) { @@ -102,11 +99,9 @@ public class WxCreditHistoryController extends BaseController { wxCreditHistory.setTenantId(tenantInfo.getFinalTenantId()); wxCreditHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); wxCreditHistory.setOperatorId(getLoginBUser().getId()); - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setId(getLoginBUser().getMerchantId()); - wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); - WxMerchant merchant = wxMerchantService.findOne(wxMerchant); - if(merchant == null){ + + WxMerchant merchant = wxMerchantService.selectById(getLoginBUser().getMerchantId()); + if(merchant == null || EnumMerchantStatus.NOT_VALID.getCode().equals(merchant.getStatus())){ return new ResultData(ErrorCode.SHOP_IS_NOT_FOUND); } //消费积分:取当前人的商户ID diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index 7c0311ff0..d09ae37a9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -139,9 +139,7 @@ public class WxMerchantController extends BaseController { // hasPermission WxMerchantBUser user = getLoginBUser(); CUser buser = getCUser(); - WxMerchant merchant = new WxMerchant(); - merchant.setId(user.getMerchantId()); - WxMerchant wxMerchant = wxMerchantService.findOne(merchant); + WxMerchant wxMerchant = wxMerchantService.selectById(user.getMerchantId()); if ( wxMerchant != null && buser.getPhone().equals(wxMerchant.getLinkPhone()) ) { if (StringUtils.isBlank(phone)) { phone = wxMerchant.getLinkPhone(); @@ -207,9 +205,7 @@ public class WxMerchantController extends BaseController { public boolean hasPermission() { WxMerchantBUser user = getLoginBUser(); CUser buser = getCUser(); - WxMerchant merchant = new WxMerchant(); - merchant.setId(user.getMerchantId()); - WxMerchant wxMerchant = wxMerchantService.findOne(merchant); + WxMerchant wxMerchant = wxMerchantService.selectById(user.getMerchantId()); return wxMerchant != null && wxMerchant.getLinkPhone().equals(buser.getPhone()); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index dbdb16a13..4592d2fab 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -142,7 +142,7 @@ public interface WxMerchantService { WxMerchantVo findMerchantById(TenantEntity tenantEntity,Long id); - WxMerchant findOne(WxMerchant wxMerchant); + WxMerchant findListOne(WxMerchant wxMerchant); void exportData(WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index ff8aa3246..f7666a6b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2658,7 +2658,7 @@ public class WxChartServiceImpl implements WxChartDataService { HashMap datamap = new HashMap<>(); WxMerchant wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(tenantEntity); - wxMerchant.setStatus(1); + wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); List merchants = wxMerchantMapper.findList(wxMerchant); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); wxMerchantTradeDaily.updateTenantInfo(tenantEntity); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index a6b566405..ee5caad2e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -900,8 +900,8 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { private int spendCredit(WxCreditHistory record) { WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setStatus(1); wxMerchant.setId(record.getMerchantId()); + wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); List wxMerchantList = wxMerchantMapper.findList(wxMerchant); if (wxMerchantList == null || wxMerchantList.size() == 0) { throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); 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 48454e878..48b8007e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -153,6 +153,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { + if(record.getIsPrivate() == null){ + record.setIsPrivate(EnumYesOrNo.NO.getCode()); + } return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); } @@ -272,6 +275,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public List findList(WxMerchant record) { + if(record.getIsPrivate() == null){ + record.setIsPrivate(EnumYesOrNo.NO.getCode()); + } return wxMerchantMapper.findList(record); } @@ -279,6 +285,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { public List findList(TenantEntity tenantEntity) { WxMerchant wxMerchant = new WxMerchant(); wxMerchant.updateTenantInfo(tenantEntity); + if(wxMerchant.getIsPrivate() == null){ + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); + } wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); List wxMerchantList = wxMerchantMapper.findList(wxMerchant); List collect = wxMerchantList.stream().map(x -> { @@ -919,12 +928,19 @@ public class WxMerchantServiceImpl implements WxMerchantService { } @Override - public WxMerchant findOne(WxMerchant wxMerchant) { - return wxMerchantMapper.selectOne(new QueryWrapper(wxMerchant)); + public WxMerchant findListOne(WxMerchant wxMerchant) { + List list = wxMerchantMapper.findList(wxMerchant); + if(list != null && !list.isEmpty()){ + list.get(0); + } + return null; } @Override public void exportData(WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { + if(wxMerchant.getIsPrivate() == null){ + wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); + } List list = wxMerchantMapper.findList(wxMerchant); list.stream().forEach(m->{ @@ -1167,6 +1183,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public PageInfo listVoAsPage(WxMerchant record, Integer pageIndex, Integer pageSize,boolean hasRentContractInfo) { + if(record.getIsPrivate() == null){ + record.setIsPrivate(EnumYesOrNo.NO.getCode()); + } Map merchantRentMap = new HashMap(); initQueryParam(record,hasRentContractInfo, merchantRentMap); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 1fba63fc1..ff34695e8 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -23,6 +23,7 @@ + @@ -50,7 +51,7 @@ m.`id`,m.`tenant_id`,m.`parent_tenant_id`,m.`img_url`,m.`name`,m.`encode`,m.`link_phone`,m.`create_date`,m.`update_date`,m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, - m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, + m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.`is_private`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, m.`introduction`,m.`action_desc`,m.`mark`,m.mark_time,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,m.credit_locked,m.credit_locked,m.entry_amount,m.cash_out_count,m.cash_out_last_time @@ -132,6 +133,9 @@ and m.`is_public` = #{isPublic} + + and m.`is_private` = #{isPrivate} + and m.`email` = #{email} @@ -256,6 +260,9 @@ and m.`is_public` = #{isPublic} + + and m.`is_private` = #{isPrivate} + and m.`id` = #{id} @@ -377,7 +384,7 @@ @@ -386,7 +393,7 @@ select m.`id`,m.`tenant_id` tenantId,m.`parent_tenant_id` parentTenantId,m.`img_url`,m.`name`,m.`encode`,m.`link_phone`,m.`create_date`,m.`update_date`, m.`car_vendor_type`,m.`car_params`,m.`status`,m.`link_person`, - m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, + m.`business_id`,m.`business_types`,m.`sub_business_id`,m.`shop_type`,m.`brand`,m.`type`,m.`is_public`,m.`is_private`,m.email,m.`title`,m.`cover_picture`,m.`is_admin`,m.`bill_setting`,m.`qr_code`,m.`tt_qr_code`, m.`introduction`,m.`action_desc`,m.`mark`,m.mark_time,m.`is_del`,m.`talk_user_main`,m.`talk_user_aux`,m.link_line_phone,m.credit_locked,m.credit_locked from wx_merchant m where m.id = #{id} and m.is_del = 0