winter 1 год назад
Родитель
Сommit
a99430fc0f
21 измененных файлов: 401 добавлений и 81 удалений
  1. +8
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  3. +3
    -2
      mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java
  8. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java
  9. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java
  10. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java
  11. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillRentService.java
  12. +22
    -11
      mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java
  13. +5
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java
  14. +43
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java
  15. +42
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java
  16. +43
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java
  17. +42
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java
  18. +42
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java
  19. +42
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  20. +42
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java
  21. +43
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java

+ 8
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -694,6 +694,14 @@ public class WxBillAllController extends BillBaseController {
return new ResultData(getBillList(wxMerchant, btype, false,getNearBillBeforeDays(), 1, 100));
}
//商户待结算账单
@PostMapping("billCompleted")
public ResultData billCompleted(@ModelAttribute WxMerchant wxMerchant) {
wxMerchant.setBillCompleteRemark("商户退租结算完成");
billAllHelper.completeBill(EnumBillStatus.STOP_TO_SETTLE, wxMerchant, getUser());
return new ResultData();
}
//###################################### 老代码 ######################################
//


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java Просмотреть файл

@@ -460,5 +460,9 @@ public class WxMerchant extends TenantEntity {
@TableField(exist = false)
private Integer billStatus;
//账单完结备注
@TableField(exist = false)
private String billCompleteRemark;
}

+ 3
- 2
mallinkService/src/main/java/com/iformall/enums/EnumBillAction.java Просмотреть файл

@@ -42,7 +42,7 @@ public enum EnumBillAction {
return message;
}
public String getDescription(String oldMoney,String newMoney,Integer payWay) {
public String getDescription(String oldMoney,String newMoney,Integer payWay,EnumBillStatus oldStatus,EnumBillStatus newStatus) {
EnumBillPayWay pw = null;
if (null != payWay) {
pw = EnumBillPayWay.getEnum(payWay);
@@ -71,10 +71,11 @@ public enum EnumBillAction {
}else if (code.intValue() == BAD.code.intValue()){
sb.append("欠缴金额").append(oldMoney).append("元");
}else if (code.intValue() == STATUS_CHANGE.code.intValue()){
sb.append("");
sb.append("状态由[").append(oldStatus.getMessage()).append("]变更为[").append(newStatus.getMessage()).append("]");
}else {
sb.append("应付金额").append(oldMoney).append("元变更成").append(newMoney).append("元");
}
return sb.toString();
}
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxBillDailyService.java Просмотреть файл

@@ -14,6 +14,7 @@ import com.iformall.domain.vo.WxBillDailyVo;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillNotify;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.enums.EnumBillStatus;

import java.util.List;

@@ -83,5 +84,6 @@ public interface WxBillDailyService {
public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline);
public void bad(WxBillPayDTO dto,MallUserInfo user);
public void stopMerchantBills(WxMerchant wxMerchant,MallUserInfo userInfo);
public void completeBill(EnumBillStatus status,WxMerchant wxMerchant,MallUserInfo user);

}

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxBillDepositService.java Просмотреть файл

@@ -13,6 +13,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillDeposit;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxRentContract;
@@ -20,6 +21,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillNotify;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.enums.EnumBillStatus;

public interface WxBillDepositService {

@@ -86,5 +88,6 @@ public interface WxBillDepositService {
public void returnDeposit(WxBillPayDTO dto, MallUserInfo user);
public void bad(WxBillPayDTO dto,MallUserInfo user);
public void rentContractStop(WxRentContract rentContract,MallUserInfo user);
public void completeBill(EnumBillStatus status,WxMerchant wxMerchant,MallUserInfo user);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxBillOtherDepositService.java Просмотреть файл

@@ -13,6 +13,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillNotify;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.enums.EnumBillStatus;

import java.util.List;

@@ -83,4 +84,5 @@ public interface WxBillOtherDepositService {
public void returnDeposit(WxBillPayDTO dto, MallUserInfo user);
public void bad(WxBillPayDTO dto,MallUserInfo user);
public void stopMerchantBills(WxMerchant wxMerchant,MallUserInfo userInfo);
public void completeBill(EnumBillStatus status,WxMerchant wxMerchant,MallUserInfo user);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxBillOtherService.java Просмотреть файл

@@ -13,6 +13,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillNotify;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.enums.EnumBillStatus;

import java.util.List;

@@ -78,5 +79,6 @@ public interface WxBillOtherService {
public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user ,boolean isOnline);
public void bad(WxBillPayDTO dto,MallUserInfo user);
public void stopMerchantBills(WxMerchant wxMerchant,MallUserInfo userInfo);
public void completeBill(EnumBillStatus status,WxMerchant wxMerchant,MallUserInfo user);
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxBillPropertyDepositService.java Просмотреть файл

@@ -13,6 +13,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillPropertyDeposit;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxPropertyContract;
@@ -20,6 +21,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillNotify;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.enums.EnumBillStatus;

/**
* @author gongbiao
@@ -88,4 +90,5 @@ public interface WxBillPropertyDepositService {
public void returnDeposit(WxBillPayDTO dto, MallUserInfo user);
public void bad(WxBillPayDTO dto,MallUserInfo user);
public void propertyContractStop(WxPropertyContract propertyContract,MallUserInfo user);
public void completeBill(EnumBillStatus status,WxMerchant wxMerchant,MallUserInfo user);
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxBillPropertyService.java Просмотреть файл

@@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillProperty;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxPropertyContract;
import com.iformall.domain.po.WxRentContract;
@@ -14,6 +15,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillNotify;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.enums.EnumBillStatus;

import java.util.List;

@@ -94,4 +96,5 @@ public interface WxBillPropertyService {
public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline);
public void bad(WxBillPayDTO dto,MallUserInfo user);
public void propertyContractStop(WxPropertyContract propertyContract,MallUserInfo user);
public void completeBill(EnumBillStatus status,WxMerchant wxMerchant,MallUserInfo user);
}

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxBillRentManageService.java Просмотреть файл

@@ -7,6 +7,7 @@ import com.iformall.domain.dto.WxBillReceiveUpdateDTO;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxBillRentManage;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxRentContract;
@@ -14,6 +15,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillNotify;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.enums.EnumBillStatus;

import java.util.List;
import java.util.Map;
@@ -93,4 +95,5 @@ public interface WxBillRentManageService {
public void updatePayByMerchant(WxBillPayDTO dto, WxMerchantBUser user,boolean isOnline);
public void bad(WxBillPayDTO dto,MallUserInfo user);
public void rentContractStop(WxRentContract rentContract,MallUserInfo user);
void completeBill(EnumBillStatus status,WxMerchant wxMerchant,MallUserInfo user);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxBillRentService.java Просмотреть файл

@@ -14,6 +14,7 @@ import com.iformall.domain.vo.WxBillHotNotify;
import com.iformall.domain.vo.WxBillNotify;
import com.iformall.domain.vo.WxBillSum;
import com.iformall.enums.EnumBillAction;
import com.iformall.enums.EnumBillStatus;

import java.util.List;

@@ -95,4 +96,5 @@ public interface WxBillRentService {
void updatePayByMerchant(WxBillPayDTO dto,WxMerchantBUser user,boolean isOnline);
void bad(WxBillPayDTO dto,MallUserInfo user);
void rentContractStop(WxRentContract rentContract,MallUserInfo user);
void completeBill(EnumBillStatus status,WxMerchant wxMerchant,MallUserInfo user);
}

+ 22
- 11
mallinkService/src/main/java/com/iformall/service/helper/WxBillAllHelper.java Просмотреть файл

@@ -970,6 +970,17 @@ public class WxBillAllHelper {
}
}
public void completeBill(EnumBillStatus status,WxMerchant wxMerchant,MallUserInfo user) {
wxBillRentService.completeBill(status,wxMerchant, user);
wxBillRentManageService.completeBill(status,wxMerchant, user);
wxBillRentDepositService.completeBill(status,wxMerchant, user);
wxBillPropertyService.completeBill(status,wxMerchant, user);
wxBillPropertyDepositService.completeBill(status,wxMerchant, user);
wxBillDailyService.completeBill(status,wxMerchant, user);
wxBillOtherService.completeBill(status,wxMerchant, user);
wxBillOtherDepositService.completeBill(status,wxMerchant, user);
}
/**
* 退租:
* 账单开始时间>= 今天,并且账单是 WAIT_PAY,NOT_PAID,NOT_EXPIRED,BAD 变为INVALID,如果已付了款,需要退回
@@ -1004,8 +1015,8 @@ public class WxBillAllHelper {
action.setOldMoney(oldReceivePay);
action.setNewMoney(newReceivePay);
action.setAction(EnumBillAction.STATUS_CHANGE.getCode());
action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null)+"商户停用,停用日期["+endTimeStr+"]");
action.setRemark("系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+realBillStatus.getMessage()+"],应收金额变为0");
action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null,EnumBillStatus.getEnum(bill.getStatus()),realBillStatus));
action.setRemark("商户停用,停用日期["+endTimeStr+"]"+"系统自动变更状态,应收金额变为0");
isUpdate = true;
//如果是已支付,则需退回全部费用
}else if (bill.getStatus().intValue() == EnumBillStatus.PAID.getCode().intValue()) {
@@ -1014,7 +1025,7 @@ public class WxBillAllHelper {
action.setOldMoney(oldReceivePay);
action.setNewMoney("0");
action.setAction(EnumBillAction.UPDATE_BILL.getCode());
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(bill.getReceivePay(), "0", null));
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(bill.getReceivePay(), "0", null,null,null));
action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]");
isUpdate = true;
}else {
@@ -1034,14 +1045,14 @@ public class WxBillAllHelper {
bill.setReceivePay(newReceivePay);
bill.setStatus(EnumBillStatus.STOP_TO_SETTLE.getCode());
action.setAction(EnumBillAction.UPDATE_BILL.getCode());
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, newReceivePay, null));
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, newReceivePay, null,null,null));
action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]");
isUpdate = true;
}else if (bill.getStatus().intValue() == EnumBillStatus.PAID.getCode().intValue()) {
bill.setReceivePay(newReceivePay);
bill.setStatus(EnumBillStatus.STOP_TO_SETTLE.getCode());
action.setAction(EnumBillAction.UPDATE_BILL.getCode());
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, newReceivePay, null));
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, newReceivePay, null,null,null));
action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]");
isUpdate = true;
}else {
@@ -1057,7 +1068,7 @@ public class WxBillAllHelper {
action.setOldMoney(oldReceivePay);
action.setNewMoney("0");
action.setAction(EnumBillAction.UPDATE_BILL.getCode());
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, "0", null));
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, "0", null,null,null));
action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]");
}else {
bill.setReceivePay("0");
@@ -1065,16 +1076,16 @@ public class WxBillAllHelper {
action.setOldMoney(oldReceivePay);
action.setNewMoney("0");
action.setAction(EnumBillAction.STATUS_CHANGE.getCode());
action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null)+"商户停用,停用日期["+endTimeStr+"]");
action.setRemark("系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.INVALID.getMessage()+"],应收金额变为0");
action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null,EnumBillStatus.getEnum(bill.getStatus()),EnumBillStatus.INVALID));
action.setRemark("商户停用,停用日期["+endTimeStr+"]"+"系统自动变更状态,应收金额变为0");
}
}else {
bill.setStatus(EnumBillStatus.STOP_TO_SETTLE.getCode());
action.setOldMoney(oldReceivePay);
action.setNewMoney("0");
action.setAction(EnumBillAction.STATUS_CHANGE.getCode());
action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null)+"商户停用,停用日期["+endTimeStr+"]");
action.setRemark("系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]");
action.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null, null,EnumBillStatus.getEnum(bill.getStatus()),EnumBillStatus.STOP_TO_SETTLE));
action.setRemark("商户停用,停用日期["+endTimeStr+"]"+"系统自动变更状态");
}
isUpdate = true;
}else if (bill.getStatus().intValue() == EnumBillStatus.PAID.getCode().intValue()) {
@@ -1084,7 +1095,7 @@ public class WxBillAllHelper {
action.setOldMoney(oldReceivePay);
action.setNewMoney("0");
action.setAction(EnumBillAction.UPDATE_BILL.getCode());
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, "0", null));
action.setDetails(EnumBillAction.UPDATE_BILL.getDescription(oldReceivePay, "0", null,null,null));
action.setRemark("商户停用,停用日期["+endTimeStr+"],系统自动由["+EnumBillStatus.getEnum(bill.getStatus()).getMessage()+"]变更为["+EnumBillStatus.STOP_TO_SETTLE.getMessage()+"]");
isUpdate = true;
}


+ 5
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxBillBaseService.java Просмотреть файл

@@ -12,6 +12,7 @@ import com.iformall.domain.po.WxBillAction;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.enums.EnumBillAction;
import com.iformall.enums.EnumBillAllType;
import com.iformall.enums.EnumBillStatus;
import com.iformall.enums.EnumSystemUserType;
import com.iformall.service.WxBillActionService;

@@ -23,13 +24,13 @@ public class WxBillBaseService{
@Autowired
private WxBillActionService wxBillActionService;

protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,Integer payWay,String remark, MallUserInfo mallUserInfo) {
protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,Integer payWay,String remark, EnumBillStatus oldStatus,EnumBillStatus newStatus,MallUserInfo mallUserInfo) {
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(billId);
wxBillAction.setBillType(billType);
wxBillAction.setOldMoney(oldMoney);
wxBillAction.setNewMoney(newMoney);
wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay));
wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay,oldStatus,newStatus));
wxBillAction.setAction(billAction.getCode());
wxBillAction.setPayDate(payDate);
wxBillAction.setPayWay(payWay);
@@ -38,13 +39,13 @@ public class WxBillBaseService{
wxBillActionService.modifyBill(wxBillAction, mallUserInfo);
}
protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,Integer payWay,String remark, WxMerchantBUser bUser) {
protected void addBillAction(EnumBillAction billAction, Integer billType,Long billId, String oldMoney, String newMoney,Date payDate,Integer payWay,String remark,EnumBillStatus oldStatus,EnumBillStatus newStatus, WxMerchantBUser bUser) {
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(billId);
wxBillAction.setBillType(billType);
wxBillAction.setOldMoney(oldMoney);
wxBillAction.setNewMoney(newMoney);
wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay));
wxBillAction.setDetails(billAction.getDescription(oldMoney, newMoney,payWay,oldStatus,newStatus));
wxBillAction.setAction(billAction.getCode());
wxBillAction.setPayDate(payDate);
wxBillAction.setPayWay(payWay);


+ 43
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java Просмотреть файл

@@ -472,18 +472,18 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
wxBillDaily.setStatus(EnumBillStatus.PAID.getCode());
String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。";
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(),
dbBill.getPay(),null,null, remark, user);
dbBill.getPay(),null,null, remark,null,null, user);
}else {
if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) {
wxBillDaily.setLatePayPrice(dto.getNewLatePrice());
wxBillDailyMapper.updateById(wxBillDaily);
this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(), user);
dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(),null,null, user);
}else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) {
wxBillDaily.setServiceChargePay(dto.getServiceChargePayUpdate());
wxBillDailyMapper.updateById(wxBillDaily);
this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user);
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user);
} else {
//租赁账单更新
wxBillDaily.setReceivePay(dto.getNewPrice());
@@ -499,7 +499,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
wxBillDailyMapper.updateById(wxBillDaily);
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark, user);
dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark,null,null, user);
}
}
}
@@ -514,14 +514,14 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillDailyMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(),
null, null,null,null,dto.getRemark(), user);
null, null,null,null,dto.getRemark(),null,null, user);
}
@Override
public void updatePay(WxBillPayDTO dto, MallUserInfo user) {
WxBillDaily wxBillRent = updateBillPay(dto);
this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(),null,null, user);
}
private WxBillDaily updateBillPay(WxBillPayDTO dto) {
@@ -601,7 +601,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
action = EnumBillAction.OFFLINE_PAY;
}
this.addBillAction(action, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
@Override
@@ -615,7 +615,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
wxBillDailyMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(),
badMoney, badMoney,null,null,dto.getRemark(), user);
badMoney, badMoney,null,null,dto.getRemark(),null,null, user);
}

@Override
@@ -649,5 +649,40 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
this.addBillAction(ba, userInfo);
}
}
@Override
public void completeBill(EnumBillStatus status, WxMerchant wxMerchant, MallUserInfo user) {
WxBillDaily bill = new WxBillDaily();
bill.updateTenantInfo(wxMerchant);
bill.setFloorForRule(wxMerchant.getFloorForRule());
bill.setBusinessForRule(wxMerchant.getBusinessForRule());
bill.setBuilding(wxMerchant.getBuilding());
bill.setFloor(wxMerchant.getFloor());
bill.setMerchantId(wxMerchant.getId());
bill.setStatus(status.getCode());
updateQueryParam(bill);
PageInfo<WxBillDaily> bpage = this.listAsPage(bill, 1, 100);
if (null != bpage && null != bpage.getList()) {
for (int i = 0 ; i < bpage.getList().size() ; i++ ) {
WxBillDaily b = bpage.getList().get(i);
WxBillDaily bu = new WxBillDaily();
bu.setId(b.getId());
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
wxBillDailyMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(b.getId());
wxBillAction.setBillType(b.getBillType());
wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode());
wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID));
wxBillAction.setRemark(wxMerchant.getBillCompleteRemark());
this.addBillAction(wxBillAction, user);
}
}
}

}

+ 42
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBillDepositServiceImpl.java Просмотреть файл

@@ -438,12 +438,12 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
wxBillDepositMapper.updateById(wxBillDeposit);
String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。";
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce,
billDepositNewPrce,payDate, null, remark, user);
billDepositNewPrce,payDate, null, remark,null,null,user);
}else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) {
wxBillDeposit.setServiceChargePay(dto.getServiceChargePayUpdate());
wxBillDepositMapper.updateById(wxBillDeposit);
this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user);
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user);
}else {
wxBillDeposit.setReceivePay(dto.getNewPrice());
Integer payWay = null;
@@ -456,7 +456,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
}
wxBillDepositMapper.updateById(wxBillDeposit);
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), billDepositOldPrce,
billDepositNewPrce,payDate,payWay,remark, user);
billDepositNewPrce,payDate,payWay,remark,null,null, user);
}
@@ -472,14 +472,14 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillDepositMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(),
null, null,null,null,dto.getRemark(), user);
null, null,null,null,dto.getRemark(),null,null, user);
}
@Override
public void updatePay(WxBillPayDTO dto, MallUserInfo user) {
WxBillDeposit wxBillRent = updateBillPay(dto);
this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(),null,null, user);
}
private WxBillDeposit updateBillPay(WxBillPayDTO dto) {
@@ -540,7 +540,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
action = EnumBillAction.OFFLINE_PAY;
}
this.addBillAction(action, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}

@Override
@@ -557,7 +557,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString());
wxBillDepositMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
@Override
@@ -571,7 +571,7 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
wxBillDepositMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(),
badMoney, badMoney,null,null,dto.getRemark(), user);
badMoney, badMoney,null,null,dto.getRemark(),null,null, user);
}

@Override
@@ -605,4 +605,38 @@ public class WxBillDepositServiceImpl extends WxBillBaseService implements WxBil
}
}

@Override
public void completeBill(EnumBillStatus status, WxMerchant wxMerchant, MallUserInfo user) {
WxBillDeposit bill = new WxBillDeposit();
bill.updateTenantInfo(wxMerchant);
bill.setFloorForRule(wxMerchant.getFloorForRule());
bill.setBusinessForRule(wxMerchant.getBusinessForRule());
bill.setBuilding(wxMerchant.getBuilding());
bill.setFloor(wxMerchant.getFloor());
bill.setMerchantId(wxMerchant.getId());
bill.setStatus(status.getCode());
setQueryParam(bill);
PageInfo<WxBillDeposit> bpage = this.listAsPage(bill, 1, 100);
if (null != bpage && null != bpage.getList()) {
for (int i = 0 ; i < bpage.getList().size() ; i++ ) {
WxBillDeposit b = bpage.getList().get(i);
WxBillDeposit bu = new WxBillDeposit();
bu.setId(b.getId());
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
wxBillDepositMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(b.getId());
wxBillAction.setBillType(b.getBillType());
wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode());
wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID));
wxBillAction.setRemark(wxMerchant.getBillCompleteRemark());
this.addBillAction(wxBillAction, user);
}
}
}

}

+ 43
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherDepositServiceImpl.java Просмотреть файл

@@ -440,12 +440,12 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。";
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
dto.getOldPrice(), dto.getNewPrice(),null,null, remark, user);
dto.getOldPrice(), dto.getNewPrice(),null,null, remark,null,null, user);
}else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) {
wxBillOtherDeposit.setServiceChargePay(dto.getServiceChargePayUpdate());
wxBillOtherDepositMapper.updateById(wxBillOtherDeposit);
this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user);
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user);
}else {
wxBillOtherDeposit.setReceivePay(dto.getNewPrice());
Date payDate = null;
@@ -460,7 +460,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
wxBillOtherDepositMapper.updateById(wxBillOtherDeposit);
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark, user);
dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark,null,null, user);
}
}
@@ -474,14 +474,14 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillOtherDepositMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(),
null, null,null,null,dto.getRemark(), user);
null, null,null,null,dto.getRemark(), null,null,user);
}
@Override
public void updatePay(WxBillPayDTO dto, MallUserInfo user) {
WxBillOtherDeposit wxBillRent = updateBillPay(dto);
this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), null,null,user);
}
private WxBillOtherDeposit updateBillPay(WxBillPayDTO dto) {
@@ -542,7 +542,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
action = EnumBillAction.OFFLINE_PAY;
}
this.addBillAction(action, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), null,null,user);
}

@Override
@@ -559,7 +559,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString());
wxBillOtherDepositMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
@Override
@@ -573,7 +573,7 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
wxBillOtherDepositMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(),
badMoney, badMoney,null,null,dto.getRemark(), user);
badMoney, badMoney,null,null,dto.getRemark(),null,null, user);
}
@Override
@@ -607,5 +607,40 @@ public class WxBillOtherDepositServiceImpl extends WxBillBaseService implements
this.addBillAction(ba, userInfo);
}
}
@Override
public void completeBill(EnumBillStatus status, WxMerchant wxMerchant, MallUserInfo user) {
WxBillOtherDeposit bill = new WxBillOtherDeposit();
bill.updateTenantInfo(wxMerchant);
bill.setFloorForRule(wxMerchant.getFloorForRule());
bill.setBusinessForRule(wxMerchant.getBusinessForRule());
bill.setBuilding(wxMerchant.getBuilding());
bill.setFloor(wxMerchant.getFloor());
bill.setMerchantId(wxMerchant.getId());
bill.setStatus(status.getCode());
updateQueryParam(bill);
PageInfo<WxBillOtherDeposit> bpage = this.listAsPage(bill, 1, 100);
if (null != bpage && null != bpage.getList()) {
for (int i = 0 ; i < bpage.getList().size() ; i++ ) {
WxBillOtherDeposit b = bpage.getList().get(i);
WxBillOtherDeposit bu = new WxBillOtherDeposit();
bu.setId(b.getId());
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
wxBillOtherDepositMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(b.getId());
wxBillAction.setBillType(b.getBillType());
wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode());
wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID));
wxBillAction.setRemark(wxMerchant.getBillCompleteRemark());
this.addBillAction(wxBillAction, user);
}
}
}

}

+ 42
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxBillOtherServiceImpl.java Просмотреть файл

@@ -382,12 +382,12 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。";
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
dto.getOldPrice(), dto.getNewPrice(),null,null, remark, user);
dto.getOldPrice(), dto.getNewPrice(),null,null, remark,null,null, user);
}else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) {
wxBillOther.setServiceChargePay(dto.getServiceChargePayUpdate());
wxBillOtherMapper.updateById(wxBillOther);
this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user);
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user);
}else {
wxBillOther.setReceivePay(dto.getNewPrice());
Date payDate = null;
@@ -402,7 +402,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
wxBillOtherMapper.updateById(wxBillOther);
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark, user);
dto.getOldPrice(), dto.getNewPrice(),payDate, payWay,remark,null,null, user);
}
@@ -418,14 +418,14 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillOtherMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(),
null, null,null,null,dto.getRemark(), user);
null, null,null,null,dto.getRemark(),null,null, user);
}
@Override
public void updatePay(WxBillPayDTO dto, MallUserInfo user) {
WxBillOther wxBillRent = updateBillPay(dto);
this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(),null,null, user);
}
private WxBillOther updateBillPay(WxBillPayDTO dto) {
@@ -485,7 +485,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
action = EnumBillAction.OFFLINE_PAY;
}
this.addBillAction(action, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
@Override
@@ -499,7 +499,7 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
wxBillOtherMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(),
badMoney, badMoney,null,null,dto.getRemark(), user);
badMoney, badMoney,null,null,dto.getRemark(),null,null, user);
}

@Override
@@ -533,4 +533,39 @@ public class WxBillOtherServiceImpl extends WxBillBaseService implements WxBillO
this.addBillAction(ba, userInfo);
}
}
@Override
public void completeBill(EnumBillStatus status, WxMerchant wxMerchant, MallUserInfo user) {
WxBillOther bill = new WxBillOther();
bill.updateTenantInfo(wxMerchant);
bill.setFloorForRule(wxMerchant.getFloorForRule());
bill.setBusinessForRule(wxMerchant.getBusinessForRule());
bill.setBuilding(wxMerchant.getBuilding());
bill.setFloor(wxMerchant.getFloor());
bill.setMerchantId(wxMerchant.getId());
bill.setStatus(status.getCode());
updateQueryParam(bill);
PageInfo<WxBillOther> bpage = this.listAsPage(bill, 1, 100);
if (null != bpage && null != bpage.getList()) {
for (int i = 0 ; i < bpage.getList().size() ; i++ ) {
WxBillOther b = bpage.getList().get(i);
WxBillOther bu = new WxBillOther();
bu.setId(b.getId());
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
wxBillOtherMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(b.getId());
wxBillAction.setBillType(b.getBillType());
wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode());
wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID));
wxBillAction.setRemark(wxMerchant.getBillCompleteRemark());
this.addBillAction(wxBillAction, user);
}
}
}
}

+ 42
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyDepositServiceImpl.java Просмотреть файл

@@ -418,12 +418,12 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。";
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
billPropertyDepositOldPrce, billPropertyDepositNewPrce,null,null, remark, user);
billPropertyDepositOldPrce, billPropertyDepositNewPrce,null,null, remark,null,null, user);
}else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) {
wxBillPropertyDeposit.setServiceChargePay(dto.getServiceChargePayUpdate());
wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit);
this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user);
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user);
}else {
wxBillPropertyDeposit.setReceivePay(dto.getNewPrice());
Date payDate = null;
@@ -438,7 +438,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
wxBillPropertyDepositMapper.updateById(wxBillPropertyDeposit);
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
billPropertyDepositOldPrce, billPropertyDepositNewPrce,payDate, payWay,remark, user);
billPropertyDepositOldPrce, billPropertyDepositNewPrce,payDate, payWay,remark,null,null, user);
}
}
@@ -453,14 +453,14 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillPropertyDepositMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(),
null, null,null,null,dto.getRemark(), user);
null, null,null,null,dto.getRemark(),null,null, user);
}
@Override
public void updatePay(WxBillPayDTO dto, MallUserInfo user) {
WxBillPropertyDeposit wxBillRent = updateBillPay(dto);
this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(), dto.getRemark(),null,null, user);
}
private WxBillPropertyDeposit updateBillPay(WxBillPayDTO dto) {
@@ -520,7 +520,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
action = EnumBillAction.OFFLINE_PAY;
}
this.addBillAction(action, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}

@Override
@@ -537,7 +537,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
wxBillRent.setReturnPrice(oldpay.add(new BigDecimal(dto.getAddpay())).toPlainString());
wxBillPropertyDepositMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.RETURN, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
@Override
@@ -551,7 +551,7 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
wxBillPropertyDepositMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(),
badMoney, badMoney,null,null,dto.getRemark(), user);
badMoney, badMoney,null,null,dto.getRemark(),null,null, user);
}

@Override
@@ -585,5 +585,38 @@ public class WxBillPropertyDepositServiceImpl extends WxBillBaseService implemen
}
}


@Override
public void completeBill(EnumBillStatus status, WxMerchant wxMerchant, MallUserInfo user) {
WxBillPropertyDeposit bill = new WxBillPropertyDeposit();
bill.updateTenantInfo(wxMerchant);
bill.setFloorForRule(wxMerchant.getFloorForRule());
bill.setBusinessForRule(wxMerchant.getBusinessForRule());
bill.setBuilding(wxMerchant.getBuilding());
bill.setFloor(wxMerchant.getFloor());
bill.setMerchantId(wxMerchant.getId());
bill.setStatus(status.getCode());
updateQueryParam(bill);
PageInfo<WxBillPropertyDeposit> bpage = this.listAsPage(bill, 1, 100);
if (null != bpage && null != bpage.getList()) {
for (int i = 0 ; i < bpage.getList().size() ; i++ ) {
WxBillPropertyDeposit b = bpage.getList().get(i);
WxBillPropertyDeposit bu = new WxBillPropertyDeposit();
bu.setId(b.getId());
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
wxBillPropertyDepositMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(b.getId());
wxBillAction.setBillType(b.getBillType());
wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode());
wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID));
wxBillAction.setRemark(wxMerchant.getBillCompleteRemark());
this.addBillAction(wxBillAction, user);
}
}
}
}

+ 42
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java Просмотреть файл

@@ -499,18 +499,18 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
wxBillPropertyMapper.updateById(wxBillProperty);
String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。";
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
dbBill.getPay(), dbBill.getPay(),null,null,remark, user);
dbBill.getPay(), dbBill.getPay(),null,null,remark,null,null, user);
}else {
if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) {
wxBillProperty.setLatePayPrice(dto.getNewLatePrice());
wxBillPropertyMapper.updateById(wxBillProperty);
this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(), user);
dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(),null,null, user);
}else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) {
wxBillProperty.setServiceChargePay(dto.getServiceChargePayUpdate());
wxBillPropertyMapper.updateById(wxBillProperty);
this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user);
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user);
} else {
Date payDate = null;
Integer payWay = null;
@@ -525,7 +525,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
wxBillPropertyMapper.updateById(wxBillProperty);
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark, user);
dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark,null,null, user);
}
}
}
@@ -540,14 +540,14 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillPropertyMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(),
null, null,null,null,dto.getRemark(), user);
null, null,null,null,dto.getRemark(),null,null, user);
}
@Override
public void updatePay(WxBillPayDTO dto, MallUserInfo user) {
WxBillProperty wxBillRent = updateBillPay(dto);
this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
private WxBillProperty updateBillPay(WxBillPayDTO dto) {
@@ -626,7 +626,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
action = EnumBillAction.OFFLINE_PAY;
}
this.addBillAction(action, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
@Override
@@ -640,7 +640,7 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
wxBillPropertyMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(),
badMoney, badMoney,null,null,dto.getRemark(), user);
badMoney, badMoney,null,null,dto.getRemark(),null,null, user);
}

@Override
@@ -680,4 +680,38 @@ public class WxBillPropertyServiceImpl extends WxBillBaseService implements WxBi
this.addBillAction(ba, user);
}
}

@Override
public void completeBill(EnumBillStatus status, WxMerchant wxMerchant, MallUserInfo user) {
WxBillProperty bill = new WxBillProperty();
bill.updateTenantInfo(wxMerchant);
bill.setFloorForRule(wxMerchant.getFloorForRule());
bill.setBusinessForRule(wxMerchant.getBusinessForRule());
bill.setBuilding(wxMerchant.getBuilding());
bill.setFloor(wxMerchant.getFloor());
bill.setMerchantId(wxMerchant.getId());
bill.setStatus(status.getCode());
updateQueryParam(bill);
PageInfo<WxBillProperty> bpage = this.listAsPage(bill, 1, 100);
if (null != bpage && null != bpage.getList()) {
for (int i = 0 ; i < bpage.getList().size() ; i++ ) {
WxBillProperty b = bpage.getList().get(i);
WxBillProperty bu = new WxBillProperty();
bu.setId(b.getId());
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
wxBillPropertyMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(b.getId());
wxBillAction.setBillType(b.getBillType());
wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode());
wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID));
wxBillAction.setRemark(wxMerchant.getBillCompleteRemark());
this.addBillAction(wxBillAction, user);
}
}
}
}

+ 42
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentManageServiceImpl.java Просмотреть файл

@@ -427,18 +427,18 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
wxBillRent.setStatus(EnumBillStatus.PAID.getCode());
wxBillRentManageMapper.updateById(wxBillRent);
String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。";
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,remark, user);
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,remark,null,null, user);
}else {
if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) {
wxBillRent.setLatePayPrice(dto.getNewLatePrice());
wxBillRentManageMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(),dto.getId(),
dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(), user);
dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(),null,null, user);
}else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) {
wxBillRent.setServiceChargePay(dto.getServiceChargePayUpdate());
wxBillRentManageMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user);
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user);
} else {
//租赁账单更新
wxBillRent.setReceivePay(dto.getNewPrice());
@@ -454,7 +454,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
wxBillRentManageMapper.updateById(wxBillRent);
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark, user);
dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark,null,null, user);
}
}
}
@@ -469,14 +469,14 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillRentManageMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(),
null, null,null,null,dto.getRemark(), user);
null, null,null,null,dto.getRemark(),null,null, user);
}
@Override
public void updatePay(WxBillPayDTO dto, MallUserInfo user) {
WxBillRentManage wxBillRent = updateBillPay(dto);
this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
private WxBillRentManage updateBillPay(WxBillPayDTO dto) {
@@ -556,7 +556,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
action = EnumBillAction.OFFLINE_PAY;
}
this.addBillAction(action, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
@Override
@@ -570,7 +570,7 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
wxBillRentManageMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(),
badMoney, badMoney,null,null,dto.getRemark(), user);
badMoney, badMoney,null,null,dto.getRemark(),null,null, user);
}
@Override
@@ -612,4 +612,38 @@ public class WxBillRentManageServiceImpl extends WxBillBaseService implements W
}
}

@Override
public void completeBill(EnumBillStatus status, WxMerchant wxMerchant, MallUserInfo user) {
WxBillRentManage bill = new WxBillRentManage();
bill.updateTenantInfo(wxMerchant);
bill.setFloorForRule(wxMerchant.getFloorForRule());
bill.setBusinessForRule(wxMerchant.getBusinessForRule());
bill.setBuilding(wxMerchant.getBuilding());
bill.setFloor(wxMerchant.getFloor());
bill.setMerchantId(wxMerchant.getId());
bill.setStatus(status.getCode());
updateQueryParam(bill);
PageInfo<WxBillRentManage> bpage = this.listAsPage(bill, 1, 100);
if (null != bpage && null != bpage.getList()) {
for (int i = 0 ; i < bpage.getList().size() ; i++ ) {
WxBillRentManage b = bpage.getList().get(i);
WxBillRentManage bu = new WxBillRentManage();
bu.setId(b.getId());
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
wxBillRentManageMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(b.getId());
wxBillAction.setBillType(b.getBillType());
wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode());
wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID));
wxBillAction.setRemark(wxMerchant.getBillCompleteRemark());
this.addBillAction(wxBillAction, user);
}
}
}

}

+ 43
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Просмотреть файл

@@ -592,18 +592,18 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
wxBillRent.setStatus(EnumBillStatus.PAID.getCode());
wxBillRentMapper.updateById(wxBillRent);
String remark = StringUtils.trimToEmpty(dto.getRemark())+ ";【系统】账单被强制为支付完成,自动归结为结清。";
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,remark, user);
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(), dbBill.getPay(), dbBill.getPay(),null,null,remark,null,null, user);
}else {
if (StringUtils.isNotBlank(dto.getOldLatePrice()) && StringUtils.isNotBlank(dto.getNewLatePrice())) {
wxBillRent.setLatePayPrice(dto.getNewLatePrice());
wxBillRentMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.UPDATE_LATE_PAY_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(), user);
dto.getOldLatePrice(), dto.getNewLatePrice(),null,null,dto.getRemark(),null,null, user);
}else if (StringUtils.isNotBlank(dto.getServiceChargePayBefore()) && StringUtils.isNotBlank(dto.getServiceChargePayUpdate())) {
wxBillRent.setServiceChargePay(dto.getServiceChargePayUpdate());
wxBillRentMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.UPDATE_SERVICE_MONEY, dto.getBillTypeValue(), dto.getId(),
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(), user);
dto.getServiceChargePayBefore(), dto.getServiceChargePayUpdate(),null,null,dto.getRemark(),null,null, user);
}else {
//租赁账单更新
wxBillRent.setReceivePay(dto.getNewPrice());
@@ -619,7 +619,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
wxBillRentMapper.updateById(wxBillRent);
//账单日志
this.addBillAction(EnumBillAction.UPDATE_BILL, dto.getBillTypeValue(),dto.getId(),
dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark, user);
dto.getOldPrice(), dto.getNewPrice(),payDate,payWay,remark,null,null, user);
}
}
}
@@ -634,14 +634,14 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
wxBillRent.setLastOweCallUser(user.getName()+"(账号:"+user.getUsername()+")");
wxBillRentMapper.updateById(wxBillRent);
this.addBillAction(EnumBillAction.NOTIFY, dto.getBillTypeValue(),dto.getId(),
null, null,null,null,dto.getRemark(), user);
null, null,null,null,dto.getRemark(),null,null, user);
}

@Override
public void updatePay(WxBillPayDTO dto, MallUserInfo user) {
WxBillRent wxBillRent = updateBillPay(dto);
this.addBillAction(EnumBillAction.OFFLINE_PAY, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}
private WxBillRent updateBillPay(WxBillPayDTO dto) {
@@ -720,7 +720,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
action = EnumBillAction.OFFLINE_PAY;
}
this.addBillAction(action, dto.getBillTypeValue(),dto.getId(),
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(), user);
dto.getAddpay(), dto.getAddpay(),wxBillRent.getPayDate(),dto.getPayWay(),dto.getRemark(),null,null, user);
}

@Override
@@ -734,7 +734,7 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
wxBillRentMapper.updateById(wxBillRent);
String badMoney = dbBill.getOwe();
this.addBillAction(EnumBillAction.BAD, dto.getBillTypeValue(),dto.getId(),
badMoney, badMoney,null,null,dto.getRemark(), user);
badMoney, badMoney,null,null,dto.getRemark(),null,null, user);
}

@Override
@@ -776,4 +776,39 @@ public class WxBillRentServiceImpl extends WxBillBaseService implements WxBillRe
}
}

@Override
public void completeBill(EnumBillStatus status, WxMerchant wxMerchant, MallUserInfo user) {
WxBillRent bill = new WxBillRent();
bill.updateTenantInfo(wxMerchant);
bill.setFloorForRule(wxMerchant.getFloorForRule());
bill.setBusinessForRule(wxMerchant.getBusinessForRule());
bill.setBuilding(wxMerchant.getBuilding());
bill.setFloor(wxMerchant.getFloor());
bill.setMerchantId(wxMerchant.getId());
bill.setStatus(status.getCode());
updateQueryParam(bill);
PageInfo<WxBillRent> bpage = this.listAsPage(bill, 1, 100);
if (null != bpage && null != bpage.getList()) {
for (int i = 0 ; i < bpage.getList().size() ; i++ ) {
WxBillRent b = bpage.getList().get(i);
WxBillRent bu = new WxBillRent();
bu.setId(b.getId());
bu.updateTenantInfo(b);
bu.setStatus(EnumBillStatus.INVALID.getCode());
bu.setUpdatetime(new Date());
wxBillRentMapper.updateById(bu);
WxBillAction wxBillAction = new WxBillAction();
wxBillAction.setBillId(b.getId());
wxBillAction.setBillType(b.getBillType());
wxBillAction.setAction(EnumBillAction.STATUS_CHANGE.getCode());
wxBillAction.setDetails(EnumBillAction.STATUS_CHANGE.getDescription(null, null,null,EnumBillStatus.getEnum(b.getStatus()),EnumBillStatus.INVALID));
wxBillAction.setRemark(wxMerchant.getBillCompleteRemark());
this.addBillAction(wxBillAction, user);
}
}
}

}

Загрузка…
Отмена
Сохранить