From ec93459202f5b1e33d1682b20a41fd4d01580981 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Mon, 11 Nov 2024 19:12:28 +0800 Subject: [PATCH] fix --- .../market/WxFinanceController.java | 16 ++---------- .../db/migration/V202411000000001.sql | 3 +++ .../po/WxRentContractAgileUnDepositItem.java | 6 ----- .../iformall/service/WxMerchantService.java | 2 -- .../impl/WxAgileContractServiceImpl.java | 17 +++++------- .../service/impl/WxAllBillServiceImpl.java | 26 +++++++++---------- .../service/impl/WxMerchantServiceImpl.java | 26 ------------------- .../WxRentPropertyContractServiceImpl.java | 17 ++++++++---- ...WxRentContractAgileUnDepositItemMapper.xml | 4 +-- .../resources/mapper/WxRentContractMapper.xml | 9 ++++--- 10 files changed, 44 insertions(+), 82 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index b142b4f50..9c06afca7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -307,9 +307,6 @@ public class WxFinanceController extends BaseController { @PostMapping("createReceive") public ResultData createReceive(@RequestBody WxFinanceReceive record) { record.updateTenantInfo(getTenantInfo()); - if (null == record.getMerchantId()) { - return new ResultData(Result.ERROR,"请选择商户"); - } if (null == record.getBills() || null == record.getPayWays()) { return new ResultData(Result.ERROR,"请选择账单和支付方式"); } @@ -356,9 +353,6 @@ public class WxFinanceController extends BaseController { @PostMapping("createCut") public ResultData createCut(@RequestBody WxFinanceReceive record) { record.updateTenantInfo(getTenantInfo()); - if (null == record.getMerchantId()) { - return new ResultData(Result.ERROR,"请选择商户"); - } if (null == record.getBills()) { return new ResultData(Result.ERROR,"请选择账单"); } @@ -370,9 +364,6 @@ public class WxFinanceController extends BaseController { @PostMapping("createPay") public ResultData createPay(@RequestBody WxFinanceReceive record) { record.updateTenantInfo(getTenantInfo()); - if (null == record.getMerchantId()) { - return new ResultData(Result.ERROR,"请选择商户"); - } if (null == record.getBills() || null == record.getPayWays()) { return new ResultData(Result.ERROR,"请选择账单和支付方式"); } @@ -393,9 +384,6 @@ public class WxFinanceController extends BaseController { if (null == record.getEnergyFeesId()) { return new ResultData(Result.ERROR,"请选择科目"); } - if (null == record.getMerchantId()) { - return new ResultData(Result.ERROR,"请选择商户"); - } // if (!this.isValidPayTime(record.getReceiveDate())) { // return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); // } @@ -481,8 +469,8 @@ public class WxFinanceController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) public ResultData receiveList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { - if (StringUtils.isNotBlank(record.getMerchantName())) { - record.setMerchantName(StringContentUtils.unescapeHtml(record.getMerchantName())); + if (StringUtils.isNotBlank(record.getBillCusName())) { + record.setBillCusName(StringContentUtils.unescapeHtml(record.getBillCusName())); } record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202411000000001.sql b/mallinkAdmin/src/main/resources/db/migration/V202411000000001.sql index 8ca5363b8..432b3ec1c 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202411000000001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202411000000001.sql @@ -55,6 +55,9 @@ alter table wx_rent_contract_revenue_sales drop column bill_id; alter table wx_rent_contract_revenue_sales drop column bill_money; 去掉唯一索引,增加 contract_id, starttime,endtime 联合唯一索引 +alter table wx_rent_contract_agile_un_deposit_item drop column merchant_id; +alter table wx_rent_contract_agile_un_deposit_item drop column shop_number; + alter table wx_shop_users change shop_id create_shop_id bigint(20) not null; alter table wx_shop_users drop column status; alter table wx_shop_users drop column begin_date; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDepositItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDepositItem.java index 1bcf93639..e90c01f3d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDepositItem.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContractAgileUnDepositItem.java @@ -33,15 +33,9 @@ public class WxRentContractAgileUnDepositItem extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="费用编号",name="unDepositId") private Long unDepositId; - @io.swagger.annotations.ApiModelProperty(value="商户编号",name="merchantId") - private Long merchantId; - @io.swagger.annotations.ApiModelProperty(value="铺位编号",name="shopId") private Long shopId; - @io.swagger.annotations.ApiModelProperty(value="铺位号",name="shopNumber") - private String shopNumber; - @io.swagger.annotations.ApiModelProperty(value="科目编号",name="feesId") private Long feesId; diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index d7f24e0f1..bbf4b8f32 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -230,6 +230,4 @@ public interface WxMerchantService { Map getShopMerchantMap(WxShop wxShop); List getShopMerchantIds(WxShop wxShop); - - String getPrivateMerchantUser(Long merchantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java index 0d746e6cf..e6d19fe82 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java @@ -53,6 +53,7 @@ import com.iformall.service.WxEnergyService; import com.iformall.service.WxFlowRecordService; import com.iformall.service.WxMallService; import com.iformall.service.WxMerchantService; +import com.iformall.service.WxShopService; import com.iformall.service.helper.WxRentContractAgileHelper; import com.iformall.service.helper.WxRentContractHelper; import com.iformall.utils.DateUtils; @@ -110,7 +111,7 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { @Lazy @Autowired - WxMerchantService wxMerchantService; + WxShopService wxShopService; @Lazy @Autowired @@ -467,15 +468,13 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { EnumRentDayPriceCalcute dayPriceCalcute = EnumRentDayPriceCalcute.getEnum(contract.getDayPriceCalcute()); List yearsBeginList = WxRentContractAgileHelper.getYearsBeginList(contract.getRentalStartDate(), contract.getRentalEndDate()); + List + List insertList = new ArrayList(); final IdWorker idWorker = IdWorker.get(); for (int i = 0 ; i < unDeposit.getItems().size(); i++) { WxRentContractAgileUnDepositItem item = unDeposit.getItems().get(i); if (item.getIsFree() == EnumYesOrNo.NO.getCode()) { - String shopNumber = item.getShopNumber(); - if (StringUtils.isBlank(shopNumber)) { - shopNumber = contract.getShopName(); - } EnumRentContractAgilPriceUnit itemPriceUnit = EnumRentContractAgilPriceUnit.getEnum(item.getPriceUnit()); //如果是租赁期,则不按周期生成费用。 if (timeUnit == EnumRentContractAgilTimeUnit.RENT_PERIOD) { @@ -510,7 +509,7 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { } private WxAllBill generateUnDepositBill(final IdWorker idWorker,WxRentContractAgileUnDeposit unDeposit,WxEnergyFees fees, - Date start,Date end,Date receiveDate,String needpay,WxRentContractAgileUnDepositItem item,String shopNumber,MallUserInfo user) { + Date start,Date end,Date receiveDate,String needpay,WxRentContractAgileUnDepositItem item,MallUserInfo user) { WxAllBill wxBillRent = new WxAllBill(); wxBillRent.setIsPreview(EnumYesOrNo.YES.getCode()); wxBillRent.setId(idWorker.nextId()); @@ -529,12 +528,8 @@ public class WxAgileContractServiceImpl implements WxAgileContractService { //截止收租日在当前时间之前 Date date = new Date(); wxBillRent.updateTenantInfo(unDeposit); - //wxBillRent.setMerchantId(unDeposit.getMerchantId()); - - - wxBillRent.setShopId(item.getShopId()); - wxBillRent.setShopNumber(shopNumber); + wxBillRent.setCusName(shopNumber); wxBillRent.setRentArea(item.getRentArea()); wxBillRent.setCreatetime(date); wxBillRent.setCreateBy(user.getId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java index c4afbe3d5..aad9806b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java @@ -130,17 +130,17 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill } } //List _sids = (List) CollectionUtils.intersection(shopIds, wxBillRent.getShopIdList()); - if (StringUtils.isNotBlank(wxBillRent.getCusName())) { - WxShopUsersInfo suq = new WxShopUsersInfo(); - suq.updateTenantInfo(wxBillRent); - suq.setName(wxBillRent.getCusName()); - List shopIds = wxShopService.getUserShopIds(suq); - if (null != shopIds && shopIds.size() > 0 ) { - wxBillRent.setCusNameShopIdList(shopIds);; - }else { - wxBillRent.setId(-1L); - } - } +// if (StringUtils.isNotBlank(wxBillRent.getCusName())) { +// WxShopUsers suq = new WxShopUsers(); +// suq.updateTenantInfo(wxBillRent); +// suq.setName(wxBillRent.getCusName()); +// List shopIds = wxShopService.getUserShopIds(suq); +// if (null != shopIds && shopIds.size() > 0 ) { +// wxBillRent.setCusNameShopIdList(shopIds);; +// }else { +// wxBillRent.setId(-1L); +// } +// } } @Override @@ -239,11 +239,11 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill WxAllBill bill = wxAllBillMapper.selectById(id, tenantEntity.getTenantId()); if (null != bill && null != bill.getShopId()) { WxShop shop = wxShopService.getById(bill.getShopId()); - WxShopUsersInfo suq = new WxShopUsersInfo(); + WxShopUsers suq = new WxShopUsers(); suq.updateTenantInfo(tenantEntity); suq.setShopId(bill.getShopId()); suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); - WxShopUsersInfo su = wxShopService.getOneShopUsers(suq); + WxShopUsers su = wxShopService.getOneShopUsers(suq); if (null != shop) { bill.setShopNumber(shop.getShopNumber()); } 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 8e0989ffe..9d3a2aeba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2338,30 +2338,4 @@ public class WxMerchantServiceImpl implements WxMerchantService { return wxMerchantShopMapper.findMerchantIdList(merchantShopQ); } - @Override - public String getPrivateMerchantUser(Long merchantId) { - WxMerchant m = this.selectById(merchantId); - if (null == m || m.getIsPrivate() != EnumYesOrNo.YES.getCode()){ - return null; - } - WxMerchantShop merchantShopQ = new WxMerchantShop(); - merchantShopQ.updateTenantInfo(m); - merchantShopQ.setMerchantId(merchantId); - merchantShopQ.setIsDel(0); - List merchantShopList = wxMerchantShopMapper.findList(merchantShopQ); - if (null == merchantShopList || merchantShopList.size() <= 0 ) { - return null; - } - WxMerchantShop ms = merchantShopList.get(0); - WxShopUsersInfo suq = new WxShopUsersInfo(); - suq.updateTenantInfo(m); - suq.setShopId(ms.getShopId()); - suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); - suq.setSortColumn(" type desc"); - List userList = wxShopUsersMapper.findList(suq); - if (null == userList || userList.size() <= 0 ){ - return null; - } - return userList.get(0).getName(); - } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java index e1b7a63cc..49a07f3f1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentPropertyContractServiceImpl.java @@ -14,11 +14,14 @@ import com.iformall.enums.EnumContractType; import com.iformall.enums.EnumRentShopType; import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.mapper.WxRentContractMapper; +import com.iformall.service.WxAgileContractService; import com.iformall.service.WxFlowRecordService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxPropertyContractService; import com.iformall.service.WxRentContractService; import com.iformall.service.WxRentPropertyContractService; +import com.iformall.service.WxShopService; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -54,15 +57,19 @@ public class WxRentPropertyContractServiceImpl implements WxRentPropertyContract @Lazy @Autowired - WxMerchantService wxMerchantService; + WxShopService wxShopService; + + @Lazy + @Autowired + WxAgileContractService wxAgileContractService; @Override public PageInfo listContractVo(WxRentPropertyContractVo record, Integer pageIndex, Integer pageSize) { - List mids = wxMerchantService.getFloorBuildMerchantIds(record, record.getFloorForRule() , null, null,record.getShopTypeForRule(), 0, 0,null); - if (null == mids || mids.size() <= 0 ) { + List ids = wxAgileContractService.findBuildingFloorContractIds(record, record.getFloorForRule(), null, null, null, 0); + if (null == ids || ids.size() <= 0 ) { record.setId(-1L); - } else { - record.setMerchantIds(mids); + }else { + record.setIds(ids); } return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.listContractVo(record)); } diff --git a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml index 265d5bc1f..73ace0f37 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractAgileUnDepositItemMapper.xml @@ -8,7 +8,6 @@ - @@ -22,7 +21,7 @@ - `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`un_deposit_id`,`shop_id`,`shop_number`, + `id`,`tenant_id`,`parent_tenant_id`,`rent_contract_id`,`un_deposit_id`,`shop_id`, `fees_id`,`begin_time`,`end_time`,`price`,`price_unit`,`createtime`,`updatetime`,`is_free`,`rent_area`,`is_father` @@ -37,6 +36,7 @@ and `rent_contract_id` = #{rentContractId} and `fees_id` = #{feesId} + and `shop_id` = #{shopId} and `un_deposit_id` = #{unDepositId} and `is_father` = #{isFather} diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 4a4cff040..2c1c90e76 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -314,9 +314,12 @@ and rc.`operation_type` = #{operationType} and rc.`day_price_calcute` = #{dayPriceCalcute} and rc.`month_average_days` = #{monthAverageDays} - - and rc.business_id in (${businessForRule}) - + + and rc.id in + + #{idItem} + + order by ${sortColumns} order by rc.createtime desc,rc.id desc