Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
96663fa182
11 changed files with 3575 additions and 3465 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  3. +11
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
  4. +16
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
  5. +14
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
  6. +12
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
  7. +12
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  8. +12
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
  9. +14
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java
  10. +9
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  11. +3472
    -3461
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -250,7 +250,7 @@ public class WxRentContractController extends WxContractBaseController {
}
//wxRentContract.setRentShopType(null);
//wxRentContract.setOperationType(null);
return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName(),oldDate,true);
return wxRentContractService.updateFile(wxRentContract, user,user.getName(),oldDate,true);
}
@GetMapping("/findById")


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/WxRentContractService.java View File

@@ -71,7 +71,7 @@ public interface WxRentContractService {

//void exportContract(HttpServletRequest request, HttpServletResponse response, Long rentId,Long propertyId);

ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName,Date oldRentStartDate,boolean writeComplate);
ResultData updateFile(WxRentContract wxRentContract, MallUserInfo user,String userName,Date oldRentStartDate,boolean writeComplate);

ResultData updateRentContractStatus(Long id,boolean buildPropertyBill);

@@ -81,7 +81,7 @@ public interface WxRentContractService {

List<WxBillRent> buildRent(MallUserInfo user,WxRentContract rentContract,Integer isPreview,boolean saveDb);

void buildDeposit(Long userId,Long rentContractId);
void buildDeposit(MallUserInfo user,Long rentContractId);

Object getMerchants(WxRentContract wxRentContract);



+ 11
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java View File

@@ -268,7 +268,11 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
//record.setStatus(record.getReceiveDate().after(date)?EnumBillStatus.WAIT_PAY.getCode():EnumBillStatus.NOT_PAID.getCode());
record.setStatus(EnumBillStatus.WAIT_PAY.getCode());
record.setCreatetime(date);
record.setCreateBy(user.getId());
record.setCreateByName(user.getName());
record.setUpdatetime(date);
record.setUpdateBy(user.getId());
record.setUpdateByName(user.getName());
record.setExpiredDay(0L);
record.updateTenantInfo(user);
//record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString());
@@ -302,6 +306,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在其他包含该时间端的费用账单");
}
wxBillDaily.setUpdatetime(date);
wxBillDaily.setUpdateBy(user.getId());
wxBillDaily.setRemark(record.getRemark());
wxBillDailyMapper.updateById(wxBillDaily);
return new ResultData(Result.SUCCESS, "更新日常账单成功");
@@ -467,6 +472,8 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
wxBillDaily.setId(dto.getId());
wxBillDaily.updateTenantInfo(dto);
wxBillDaily.setUpdatetime(new Date());
wxBillDaily.setUpdateBy(user.getId());
wxBillDaily.setUpdateByName(user.getName());
if (forcePaid) {
wxBillDaily.setReceivePay(dbBill.getPay());
wxBillDaily.setStatus(EnumBillStatus.PAID.getCode());
@@ -611,6 +618,8 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setStatus(EnumBillStatus.BAD.getCode());
wxBillDailyMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
@@ -671,6 +680,8 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
bu.setUpdateBy(user.getId());
bu.setUpdateByName(user.getName());
wxBillDailyMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();


+ 16
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java View File

@@ -272,7 +272,11 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
record.setId(idWorker.nextId());
record.setStatus(EnumBillStatus.WAIT_PAY.getCode());
record.setCreatetime(date);
record.setCreateBy(user.getId());
record.setCreateByName(user.getName());
record.setUpdatetime(date);
record.setUpdateBy(user.getId());
record.setUpdateByName(user.getName());
record.setExpiredDay(0L);
//record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString());
//record.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString());
@@ -306,6 +310,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在包含该时间端的费用账单");
}
record.setUpdatetime(date);
record.setUpdateBy(user.getId());
wxBillOtherDepositMapper.updateById(record);
return new ResultData(Result.SUCCESS, "更新其他账单成功");
}
@@ -433,6 +438,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
wxBillOtherDeposit.setId(dto.getId());
wxBillOtherDeposit.updateTenantInfo(dto);
wxBillOtherDeposit.setUpdatetime(new Date());
wxBillOtherDeposit.setUpdateBy(user.getId());
wxBillOtherDeposit.setUpdateByName(user.getName());
if (forcePaid) {
wxBillOtherDeposit.setReceivePay(dbBill.getPay());
wxBillOtherDeposit.setStatus(EnumBillStatus.PAID.getCode());
@@ -470,6 +477,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setLastOweCallTime(new Date());
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillOtherDepositMapper.updateById(wxBillRent);
@@ -490,6 +499,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
BigDecimal opay = new BigDecimal(0);
if (StringUtils.isNotBlank(dbBill.getPay())) {
opay = new BigDecimal(dbBill.getPay());
@@ -556,6 +566,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString());
wxBillOtherDepositMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(),
@@ -569,6 +581,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setStatus(EnumBillStatus.BAD.getCode());
wxBillOtherDepositMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
@@ -629,6 +643,8 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
bu.setUpdateBy(user.getId());
bu.setUpdateByName(user.getName());
wxBillOtherDepositMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();


+ 14
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java View File

@@ -271,7 +271,11 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
//record.setStatus(record.getReceiveDate().after(date)?EnumBillStatus.WAIT_PAY.getCode():EnumBillStatus.NOT_PAID.getCode());
record.setStatus(EnumBillStatus.WAIT_PAY.getCode());
record.setCreatetime(date);
record.setCreateBy(user.getId());
record.setCreateByName(user.getName());
record.setUpdatetime(date);
record.setUpdateBy(user.getId());
record.setUpdateByName(user.getName());
record.setExpiredDay(0L);
record.updateTenantInfo(user);
//record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString());
@@ -306,6 +310,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
return new ResultData(ErrorCode.BILL_IS_FOUND.getCode(),"商户已存在其他包含该时间端的费用账单");
}
record.setUpdatetime(date);
record.setUpdateBy(user.getId());
record.setUpdateByName(user.getName());
wxBillOtherMapper.updateById(record);
return new ResultData(Result.SUCCESS, "更新其他押金账单成功");
}
@@ -375,6 +381,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
wxBillOther.setId(dto.getId());
wxBillOther.updateTenantInfo(dto);
wxBillOther.setUpdatetime(new Date());
wxBillOther.setUpdateBy(user.getId());
wxBillOther.setUpdateByName(user.getName());
if (forcePaid) {
wxBillOther.setReceivePay(dbBill.getPay());
wxBillOther.setStatus(EnumBillStatus.PAID.getCode());
@@ -414,6 +422,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setLastOweCallTime(new Date());
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillOtherMapper.updateById(wxBillRent);
@@ -495,6 +505,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setStatus(EnumBillStatus.BAD.getCode());
wxBillOtherMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
@@ -555,6 +567,8 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
bu.setUpdateBy(user.getId());
bu.setUpdateByName(user.getName());
wxBillOtherMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();


+ 12
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java View File

@@ -271,7 +271,11 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setCreatetime(date);
record.setUpdateBy(user.getId());
record.setUpdateByName(user.getName());
record.setUpdatetime(date);
record.setCreateBy(user.getId());
record.setCreateByName(user.getName());
record.updateTenantInfo(user);
//record.setOwe(new BigDecimal(receivepay).subtract(new BigDecimal(pay)).toPlainString());
record.setIsDel(EnumDelStatus.NOT_DEL.getCode());
@@ -407,6 +411,8 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
wxBillPropertyDeposit.setId(dto.getId());
wxBillPropertyDeposit.updateTenantInfo(dto);
wxBillPropertyDeposit.setUpdatetime(new Date());
wxBillPropertyDeposit.setUpdateBy(user.getId());
wxBillPropertyDeposit.setUpdateByName(user.getName());
String billPropertyDepositOldPrce = dto.getOldPrice();
String billPropertyDepositNewPrce = dto.getNewPrice();
if (forcePaid) {
@@ -534,6 +540,8 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString());
wxBillPropertyDepositMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(),
@@ -547,6 +555,8 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setStatus(EnumBillStatus.BAD.getCode());
wxBillPropertyDepositMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
@@ -606,6 +616,8 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
bu.setUpdateBy(user.getId());
bu.setUpdateByName(user.getName());
wxBillPropertyDepositMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();


+ 12
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java View File

@@ -315,6 +315,10 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
record.setId(idWorker.nextId());
record.setCreatetime(date);
record.setUpdatetime(date);
record.setUpdateBy(user.getId());
record.setUpdateByName(user.getName());
record.setCreateBy(user.getId());
record.setCreateByName(user.getName());
record.updateTenantInfo(user);
//record.setOwe(new BigDecimal(record.getRealReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString());
//record.setOwe(new BigDecimal(record.getReceivePay()).subtract(new BigDecimal(record.getPay())).toPlainString());
@@ -493,6 +497,8 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
wxBillProperty.setId(dto.getId());
wxBillProperty.updateTenantInfo(dto);
wxBillProperty.setUpdatetime(new Date());
wxBillProperty.setUpdateBy(user.getId());
wxBillProperty.setUpdateByName(user.getName());
if (forcePaid) {
wxBillProperty.setReceivePay(dbBill.getPay());
wxBillProperty.setStatus(EnumBillStatus.PAID.getCode());
@@ -536,6 +542,8 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setLastOweCallTime(new Date());
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillPropertyMapper.updateById(wxBillRent);
@@ -636,6 +644,8 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setStatus(EnumBillStatus.BAD.getCode());
wxBillPropertyMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
@@ -702,6 +712,8 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
bu.setUpdateBy(user.getId());
bu.setUpdateByName(user.getName());
wxBillPropertyMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();


+ 12
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java View File

@@ -191,6 +191,10 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
record.setId(idWorker.nextId());
record.setCreatetime(date);
record.setUpdatetime(date);
record.setUpdateBy(user.getId());
record.setUpdateByName(user.getName());
record.setCreateBy(user.getId());
record.setCreateByName(user.getName());
record.updateTenantInfo(user);
//record.setOwe(new BigDecimal(receivepay).subtract(new BigDecimal(pay)).toPlainString());
record.setIsDel(EnumDelStatus.NOT_DEL.getCode());
@@ -422,6 +426,8 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
if (forcePaid) {
wxBillRent.setReceivePay(dbBill.getPay());
wxBillRent.setStatus(EnumBillStatus.PAID.getCode());
@@ -465,6 +471,8 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setLastOweCallTime(new Date());
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillRentManageMapper.updateById(wxBillRent);
@@ -566,6 +574,8 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setStatus(EnumBillStatus.BAD.getCode());
wxBillRentManageMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
@@ -633,6 +643,8 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
bu.setUpdateBy(user.getId());
bu.setUpdateByName(user.getName());
wxBillRentManageMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();


+ 14
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java View File

@@ -185,6 +185,10 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
record.setId(idWorker.nextId());
record.setCreatetime(date);
record.setUpdatetime(date);
record.setUpdateBy(user.getId());
record.setUpdateByName(user.getName());
record.setCreateBy(user.getId());
record.setCreateByName(user.getName());
record.updateTenantInfo(user);
//record.setOwe(new BigDecimal(receivepay).subtract(new BigDecimal(pay)).toPlainString());
record.setIsDel(EnumDelStatus.NOT_DEL.getCode());
@@ -350,6 +354,8 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
String oldPrice = wxBillRent.getReceivePay();
String newPrice = newReceivePay;
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
String latePayPrice = StringUtils.isBlank(wxBillRent.getLatePayPrice()) ? "0" : wxBillRent.getLatePayPrice();
//wxBillRent.setOwe(new BigDecimal(newPrice).add(new BigDecimal(wxBillRent.getServiceChargePay())).add(new BigDecimal(latePayPrice)).subtract(new BigDecimal(wxBillRent.getPay())).toPlainString());
//wxBillRent.setOwe(new BigDecimal(newPrice).subtract(new BigDecimal(wxBillRent.getPay())).toPlainString());
@@ -592,6 +598,8 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
if (forcePaid) {
wxBillRent.setReceivePay(dbBill.getPay());
wxBillRent.setStatus(EnumBillStatus.PAID.getCode());
@@ -635,6 +643,8 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setLastOweCallTime(new Date());
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillRentMapper.updateById(wxBillRent);
@@ -735,6 +745,8 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
wxBillRent.setId(dto.getId());
wxBillRent.updateTenantInfo(dto);
wxBillRent.setUpdatetime(new Date());
wxBillRent.setUpdateBy(user.getId());
wxBillRent.setUpdateByName(user.getName());
wxBillRent.setStatus(EnumBillStatus.BAD.getCode());
wxBillRentMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
@@ -802,6 +814,8 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
bu.setUpdateBy(user.getId());
bu.setUpdateByName(user.getName());
wxBillRentMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();


+ 9
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java View File

@@ -267,7 +267,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
/**
* 重新生成账单(预账单调整)
*/
public void savePreviewBill(WxPropertyContract record){
public void savePreviewBill(WxPropertyContract record,MallUserInfo user){
if(CollectionUtils.isEmpty(record.getPreviewBillRentList())){
return;
}
@@ -280,10 +280,14 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
Date date = new Date();
bill.setPropertyContractId(record.getId());
bill.setCreatetime(date);
bill.setCreateBy(user.getId());
bill.setCreateByName(user.getName());
bill.updateTenantInfo(wxPayAccountBill);
//bill.setOwe(bill.getReceivePay());
bill.setNeedPay(bill.getNeedPay());
bill.setUpdatetime(date);
bill.setUpdateBy(user.getId());
bill.setUpdateByName(user.getName());
bill.setRentShopType(record.getRentShopType());
bill.setPeriod(count);
bill.setIsPreview(EnumIsPreview.YES.getCode());
@@ -525,7 +529,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillDeposit.setMerchantId(record.getMerchantId());
//wxBillDeposit.setShopId(wxPropertyContract.getShopId());
wxBillDeposit.setCreatetime(date);
//wxBillDeposit.setCreateBy(user.getId());
//wxBillDeposit.setCreateByName(user.getName());
wxBillDeposit.setUpdatetime(date);
//wxBillDeposit.setUpdateBy(user.getId());
//wxBillDeposit.setUpdateByName(user.getName());
wxBillDeposit.setIsDel(EnumDelStatus.NOT_DEL.getCode());
wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType());
wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract));


+ 3472
- 3461
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
File diff suppressed because it is too large
View File


Loading…
Cancel
Save