diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 57c664e65..e605c81d9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -267,7 +267,7 @@ public class WxMerchantController extends BaseController { @SystemControllerLog(description = "商户-停用") public ResultData disable(Long id) { logger.debug("[" + getIpAddr() + "] WxMerchantController::disable"); - wxMerchantService.disable(id); + wxMerchantService.disable(id,this.getUser()); return new ResultData(Result.SUCCESS, "停用成功"); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java index 24e12c64a..f3164ca1c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillPropertyMapper.java @@ -42,7 +42,8 @@ public interface WxBillPropertyMapper extends CommonMapper void updateInvalidStatusByRent(WxRentContract wxRentContract); - void deletePreviewBill(WxPropertyContract wxPropertyContract); + void deleteBillByContract(WxPropertyContract wxPropertyContract); + void deletePreviewBill(WxBillProperty wxBillProperty); void updateForReceivePay(WxBillProperty record); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java index 4d9807922..c5f3ca65f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillRentMapper.java @@ -37,7 +37,8 @@ public interface WxBillRentMapper extends CommonMapper { void updateInvalidStatus(WxBillRent wxBillRent); - void deletePreviewBill(WxRentContract wxRentContract); + void deleteBillByContract(WxRentContract wxRentContract); + void deletePreviewBill(WxBillRent wxBillRent); void updateForReceiverPay(WxBillRent record); diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java index e2455384e..03313d20d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java @@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillDaily; import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillDailyVo; @@ -81,5 +82,6 @@ public interface WxBillDailyService { public void updatePay(WxBillPayDTO dto, MallUserInfo user); public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline); public void bad(WxBillPayDTO dto,MallUserInfo user); + public void stopMerchantBills(WxMerchant wxMerchant,MallUserInfo userInfo); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java index 21b89b3f4..f2f2686ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java @@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; @@ -81,4 +82,5 @@ public interface WxBillOtherDepositService { public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline); public void returnDeposit(WxBillPayDTO dto, MallUserInfo user); public void bad(WxBillPayDTO dto,MallUserInfo user); + public void stopMerchantBills(WxMerchant wxMerchant,MallUserInfo userInfo); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java index d9ffb78f6..a0a7cfcee 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java @@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillOther; import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxBillHotNotify; @@ -76,5 +77,6 @@ public interface WxBillOtherService { public void updatePay(WxBillPayDTO dto, MallUserInfo user); public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user ,boolean isOnline); public void bad(WxBillPayDTO dto,MallUserInfo user); + public void stopMerchantBills(WxMerchant wxMerchant,MallUserInfo userInfo); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index 9f60aff51..8a29146e5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -125,7 +125,7 @@ public interface WxMerchantService { void deleteById(Long id); - void disable(Long id); + void disable(Long id,MallUserInfo userInfo); ResultData addMerchant(WxMerchant wxMerchant, Long userId); diff --git a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java index f2c3030de..ab84563e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java @@ -1114,8 +1114,10 @@ public class WxBillAllHelper { } //终止商户除了租赁账单以外的 - public void stopMerchantOtherBills(WxMerchant wxMerchant) { - + public void stopMerchantOtherBills(WxMerchant wxMerchant,MallUserInfo user) { + wxBillDailyService.stopMerchantBills(wxMerchant, user); + wxBillOtherService.stopMerchantBills(wxMerchant, user); + wxBillOtherDepositService.stopMerchantBills(wxMerchant, user); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java index b17505e86..b5a25ceba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java @@ -28,6 +28,7 @@ import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillDailyService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxPayAccountBillService; +import com.iformall.service.helper.WxBillAllHelper; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; @@ -75,6 +76,10 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD @Lazy @Autowired WxMerchantService wxMerchantService; + + @Lazy + @Autowired + WxBillAllHelper wxBillAllHelper; @Override public PageInfo listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize) { @@ -613,4 +618,36 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD badMoney, badMoney,null,null,dto.getRemark(), user); } + @Override + public void stopMerchantBills(WxMerchant wxMerchant, MallUserInfo userInfo) { + WxBillDaily wxBillRent = new WxBillDaily(); + wxBillRent.setMerchantId(wxMerchant.getId()); + wxBillRent.updateTenantInfo(wxMerchant); + List brList = wxBillDailyMapper.findList(wxBillRent); + List realRentList = new ArrayList(); + List actionList = new ArrayList(); + Date current = DateUtils.getDayEnd(new Date()); + if (null != brList && brList.size() > 0 ) { + for (int i = 0 ; i < brList.size() ; i ++ ) { + WxBillDaily brent = brList.get(i); + WxBillAction action = new WxBillAction(); + boolean isUpdate = wxBillAllHelper.billEndCalcute(2,current, brent, action, false); + if (isUpdate) { + realRentList.add(brent); + actionList.add(action); + } + } + } + + for (int i = 0 ; i < realRentList.size() ; i ++) { + WxBillDaily rbrent = realRentList.get(i); + wxBillDailyMapper.updateById(rbrent); + } + + for (int i = 0 ; i < actionList.size() ; i ++) { + WxBillAction ba = actionList.get(i); + this.addBillAction(ba, userInfo); + } + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java index 7bb592b57..9a6537086 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java @@ -30,6 +30,7 @@ import com.iformall.enums.EnumBillStatus; import com.iformall.enums.EnumDelStatus; import com.iformall.enums.EnumRentContractType; import com.iformall.enums.EnumRentShopType; +import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxBillDepositMapper; import com.iformall.mapper.WxRentContractMapper; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java index d1102cfba..e158ce684 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java @@ -32,6 +32,7 @@ import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillOtherDepositService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxPayAccountBillService; +import com.iformall.service.helper.WxBillAllHelper; import com.iformall.utils.DateUtils; import org.apache.commons.collections.CollectionUtils; @@ -80,6 +81,10 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements @Lazy @Autowired WxMerchantService wxMerchantService; + + @Lazy + @Autowired + WxBillAllHelper wxBillAllHelper; @Override public PageInfo listAsPage(WxBillOtherDeposit record, Integer pageIndex, Integer pageSize) { @@ -570,5 +575,37 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), badMoney, badMoney,null,null,dto.getRemark(), user); } + + @Override + public void stopMerchantBills(WxMerchant wxMerchant, MallUserInfo userInfo) { + WxBillOtherDeposit wxBillRent = new WxBillOtherDeposit(); + wxBillRent.setMerchantId(wxMerchant.getId()); + wxBillRent.updateTenantInfo(wxMerchant); + List brList = wxBillOtherDepositMapper.findList(wxBillRent); + List realRentList = new ArrayList(); + List actionList = new ArrayList(); + Date current = DateUtils.getDayEnd(new Date()); + if (null != brList && brList.size() > 0 ) { + for (int i = 0 ; i < brList.size() ; i ++ ) { + WxBillOtherDeposit brent = brList.get(i); + WxBillAction action = new WxBillAction(); + boolean isUpdate = wxBillAllHelper.billEndCalcute(2,current, brent, action, true); + if (isUpdate) { + realRentList.add(brent); + actionList.add(action); + } + } + } + + for (int i = 0 ; i < realRentList.size() ; i ++) { + WxBillOtherDeposit rbrent = realRentList.get(i); + wxBillOtherDepositMapper.updateById(rbrent); + } + + for (int i = 0 ; i < actionList.size() ; i ++) { + WxBillAction ba = actionList.get(i); + this.addBillAction(ba, userInfo); + } + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java index 5227a61c4..80d050c0c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java @@ -31,6 +31,7 @@ import com.iformall.service.WxBillActionService; import com.iformall.service.WxBillOtherService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxPayAccountBillService; +import com.iformall.service.helper.WxBillAllHelper; import com.iformall.utils.DateUtils; import org.apache.commons.collections.CollectionUtils; @@ -79,6 +80,10 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO @Lazy @Autowired WxMerchantService wxMerchantService; + + @Lazy + @Autowired + WxBillAllHelper wxBillAllHelper; @Override public PageInfo listAsPage(WxBillOther record, Integer pageIndex, Integer pageSize) { @@ -496,4 +501,36 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(), badMoney, badMoney,null,null,dto.getRemark(), user); } + + @Override + public void stopMerchantBills(WxMerchant wxMerchant, MallUserInfo userInfo) { + WxBillOther wxBillRent = new WxBillOther(); + wxBillRent.setMerchantId(wxMerchant.getId()); + wxBillRent.updateTenantInfo(wxMerchant); + List brList = wxBillOtherMapper.findList(wxBillRent); + List realRentList = new ArrayList(); + List actionList = new ArrayList(); + Date current = DateUtils.getDayEnd(new Date()); + if (null != brList && brList.size() > 0 ) { + for (int i = 0 ; i < brList.size() ; i ++ ) { + WxBillOther brent = brList.get(i); + WxBillAction action = new WxBillAction(); + boolean isUpdate = wxBillAllHelper.billEndCalcute(2,current, brent, action, false); + if (isUpdate) { + realRentList.add(brent); + actionList.add(action); + } + } + } + + for (int i = 0 ; i < realRentList.size() ; i ++) { + WxBillOther rbrent = realRentList.get(i); + wxBillOtherMapper.updateById(rbrent); + } + + for (int i = 0 ; i < actionList.size() ; i ++) { + WxBillAction ba = actionList.get(i); + this.addBillAction(ba, userInfo); + } + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 9b45da5fe..3787cafa9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -645,8 +645,15 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi @Override public void propertyContractStop(WxPropertyContract propertyContract, MallUserInfo user) { + WxBillProperty brDel = new WxBillProperty(); + brDel.setPropertyContractId(propertyContract.getId()); + brDel.setIsPreview(EnumYesOrNo.YES.getCode()); + brDel.updateTenantInfo(propertyContract); + wxBillPropertyMapper.deletePreviewBill(brDel); + WxBillProperty br = new WxBillProperty(); br.setPropertyContractId(propertyContract.getId()); + br.setIsPreview(EnumYesOrNo.NO.getCode()); br.updateTenantInfo(propertyContract); List brList = wxBillPropertyMapper.findList(br); List realRentList = new ArrayList(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java index 51f124ce5..3e0bc115c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java @@ -575,6 +575,13 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W @Override public void rentContractStop(WxRentContract rentContract,MallUserInfo user) { + //删掉草稿状态的账单 + WxBillRentManage brDel = new WxBillRentManage(); + brDel.setRentContractId(rentContract.getId()); + brDel.updateTenantInfo(rentContract); + brDel.setIsPreview(EnumIsPreview.YES.getCode()); + wxBillRentManageMapper.deletePreviewBill(brDel); + WxBillRentManage br = new WxBillRentManage(); br.setRentContractId(rentContract.getId()); br.updateTenantInfo(rentContract); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 61069e79e..e85309166 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -739,6 +739,13 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe @Override public void rentContractStop(WxRentContract rentContract,MallUserInfo user) { + //删除草稿状态的账单 + WxBillRent brDel = new WxBillRent(); + brDel.setRentContractId(rentContract.getId()); + brDel.updateTenantInfo(rentContract); + brDel.setIsPreview(EnumYesOrNo.YES.getCode()); + wxBillRentMapper.deletePreviewBill(brDel); + WxBillRent br = new WxBillRent(); br.setRentContractId(rentContract.getId()); br.updateTenantInfo(rentContract); 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 c093972d9..f0bff1cfa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -19,6 +19,7 @@ import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.*; +import com.iformall.service.helper.WxBillAllHelper; import com.iformall.service.util.CouponCacheUtils; import com.iformall.utils.Constant; import com.iformall.utils.DateUtils; @@ -164,6 +165,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Autowired private WxMerchantBUserService wxMerchantBUserService; + @Lazy + @Autowired + WxBillAllHelper wxBillAllHelper; + @Autowired @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; @@ -459,7 +464,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override @Transactional(rollbackFor = {Exception.class}) - public void disable(Long id) { + public void disable(Long id,MallUserInfo userInfo) { WxMerchant wxMerchant = wxMerchantMapper.selectById(id); if (wxMerchant == null) { logger.info("未发现要停用的商户"); @@ -531,6 +536,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxCouponService.disable(wxMerchant,cid, null); CouponCacheUtils.removeCouponMerchantCache(redisTemplate, cid,null); }); + + //处理商户非租赁账单 + wxBillAllHelper.stopMerchantOtherBills(wxMerchant, userInfo); } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 05254d0e6..021db39ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -254,7 +254,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){ return; } - wxBillPropertyMapper.deletePreviewBill(record); + wxBillPropertyMapper.deleteBillByContract(record); WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); final IdWorker idWorker = IdWorker.get(); int count = 1; @@ -389,7 +389,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); } //生成预览账单 - wxBillPropertyMapper.deletePreviewBill(record); + wxBillPropertyMapper.deleteBillByContract(record); //重新生成 List billList = buildProperty(new WxMerchant(),userId,record,EnumIsPreview.YES.getCode(),true); record.setPreviewBillRentList(billList); @@ -409,7 +409,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals("0")) { //删除预账单,重新生成 - wxBillPropertyMapper.deletePreviewBill(record); + wxBillPropertyMapper.deleteBillByContract(record); //重新生成 billList = buildProperty(new WxMerchant(),userId,record,EnumIsPreview.YES.getCode(),true); record.setPreviewBillRentList(billList); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index ba94b8908..3d43f193d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -597,7 +597,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (record.getReceivePeriod() != null && record.getLease() != null && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0)) { //删除预账单,重新生成 - wxBillRentMapper.deletePreviewBill(record); + wxBillRentMapper.deleteBillByContract(record); //删除商业管理费账单 WxBillRentManage wxBillRentManage = new WxBillRentManage(); wxBillRentManage.setRentContractId(record.getId()); @@ -666,7 +666,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (null == record.getDecimalSize()) { record.setDecimalSize(Constant.default_short_decimal_size); } - wxBillRentMapper.deletePreviewBill(record); + wxBillRentMapper.deleteBillByContract(record); WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantInfo(record); final IdWorker idWorker = IdWorker.get(); int count = 1; diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 95788c58d..5e60bb768 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -326,9 +326,14 @@ and status != 3 - + delete from wx_bill_property where property_contract_id = #{id} + + + delete from wx_bill_property where property_contract_id = #{propertyContractId} + and is_preview = #{isPreview} + update wx_bill_property set updatetime = now() diff --git a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml index 148e56de1..6b600975d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentManageMapper.xml @@ -275,6 +275,7 @@ delete from wx_bill_rent_manage where rent_contract_id = #{rentContractId} and manage_fee_type = #{manageFeeType} + and `is_preview` = #{isPreview}