Просмотр исходного кода

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
xiaohu 1 год назад
Родитель
Сommit
1ecf696f53
11 измененных файлов: 65 добавлений и 477 удалений
  1. +31
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java
  2. +0
    -390
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  3. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java
  4. +2
    -15
      mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
  5. +0
    -22
      mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxAgileContractService.java
  7. +0
    -2
      mallinkService/src/main/java/com/iformall/service/WxRentContractService.java
  8. +18
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxAgileContractServiceImpl.java
  9. +0
    -18
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  10. +4
    -10
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml
  11. +2
    -8
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 31
- 6
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java Просмотреть файл

@@ -144,12 +144,6 @@ public class WxAgileContractController extends WxContractBaseController {
}
//以前合同必填的数据初始化
wxRentContract.setDecimalSize(2);
wxRentContract.setReceivePeriodUnit(EnumContractReceivePeriodUnit.MONTH.getCode());
//wxRentContract.setRevenueRatio(EnumYesOrNo.NO.getCode());
//wxRentContract.setRevenueFixedRentPrice(EnumYesOrNo.NO.getCode());
//wxRentContract.setOutDateNotifyDays(0);
wxRentContract.setPayPeriodRate(1);
//wxRentContract.setOperationType(EnumContractOperationType.PART.getCode());
if (null == wxRentContract.getRentalStartDate()) {
return new ResultData(Result.ERROR,"请选择合同开始日期");
}
@@ -431,6 +425,37 @@ public class WxAgileContractController extends WxContractBaseController {
return new ResultData(rentContract);
}

//转签
@PostMapping("transfer")
public ResultData transfer(@RequestBody WxRentContract wxRentContract) {
if (null == wxRentContract.getId() || null == wxRentContract.getCustomerType() ||
StringUtils.isBlank(wxRentContract.getCustomerName()) || StringUtils.isBlank(wxRentContract.getCustomerPhone())){
return new ResultData(Result.ERROR, "缺少参数");
}
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId());
if (null == rentContract) {
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同");
}
MallUserInfo user = getUser();
try {
rentContract.setCustomersId(wxRentContract.getCustomersId());
rentContract.setCustomerType(wxRentContract.getCustomerType());
rentContract.setCustomerName(wxRentContract.getCustomerName());
rentContract.setCustomerLinkPerson(wxRentContract.getCustomerLinkPerson());
rentContract.setCustomerPhone(wxRentContract.getCustomerPhone());
rentContract.setCustomerLegalPerson(wxRentContract.getCustomerLegalPerson());
wxAgileContractService.transfer(rentContract,user);
}catch(Exception e) {
logger.error("transfer error.",e);
return new ResultData(Result.ERROR,e.getMessage());
}
return new ResultData(rentContract);
}
}



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

@@ -61,43 +61,6 @@ public class WxRentContractController extends WxContractBaseController {
@Autowired
WxBillAllHelper wxBillAllHelper;
// @GetMapping("/list")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
// public ResultData list(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) {
// logger.debug("[" + getIpAddr() + "] WxRentContractController::list");
// if (null == wxRentContract) {
// wxRentContract = new WxRentContract();
// }
// wxRentContract.updateTenantInfo(getTenantInfo());
// wxRentContract.setSortColumns(" updatetime desc");
// //Map<String, Object> result = wxRentContractService.listAsPage(wxRentContract, pageNum, pageSize);
// WxUserDataRule dataRule = this.getCurrentDataFloors();
// if (null != dataRule) {
// wxRentContract.setFloorForRule(dataRule.getFloorIds());
// wxRentContract.setBusinessForRule(dataRule.getBussinessIds());
// wxRentContract.setShopTypeForRule(dataRule.getShopTypes());
// }
// wxRentContract.setAgileType(EnumRentAgileType.STANDARDS_YEAR.getCode());
// PageInfo<WxRentContract> page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize);
// Integer hasFlow = null;
// if (null != page && null != page.getList()) {
// for (WxRentContract wrc: page.getList()) {
// if (null == hasFlow) {
// if(rentContractHasWorkFlow(wrc)) {
// hasFlow = 1;
// }else {
// hasFlow = 0;
// }
// }
// wrc.setFlowHas(hasFlow);
// }
// }
//
// return new ResultData(page);
// }
@GetMapping("getDateDiff")
@ApiImplicitParams({
@ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query", required = true),
@@ -112,45 +75,6 @@ public class WxRentContractController extends WxContractBaseController {
return new ResultData(map);
}
/**
* 新增第一步
* @param wxRentContract
* @return
*/
// @PostMapping("add")
// public ResultData add(@RequestBody WxRentContract wxRentContract) {
// //WxMerchant wxMerchant = new WxMerchant();
// //wxMerchant.setName(wxRentContract.getMerchantName());
// //wxMerchant.setId(wxRentContract.getMerchantId());
//// if (wxMerchantService.hasMerchant(wxMerchant)) {
//// return new ResultData(ErrorCode.MERCHANT_NAME_IS_FOUND);
//// }
// MallUserInfo user = getUser();
// wxRentContract.updateTenantInfo(user);
// wxRentContract.setAdjustPeriodHandle();
// Date oldDate = wxRentContract.getRentalStartDate();
// wxRentContract.setRentStartType(EnumRentStartType.RENTTIME.getCode());
//// if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
//// wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
//// }
// try {
// rentContractValidShop(wxRentContract);
// } catch (Exception e) {
// return new ResultData(Result.ERROR,e.getMessage());
// }
// return wxRentContractService.save(wxRentContract, user,user.getName(),oldDate);
// }


// /**
// * 计算价格
// */
// @PostMapping("calcutePrice")
// public ResultData calcutePrice(@RequestBody WxRentContract wxRentContract) {
// wxRentContract.calcutePrice();
// return new ResultData(wxRentContract.getPrice());
// }
/**
* 获取免租期
*/
@@ -161,143 +85,6 @@ public class WxRentContractController extends WxContractBaseController {
return new ResultData(wxRentContractService.getFreePeriods(contract));
}
// /**
// * 设置免租期
// * @param wxRentContract
// * @return
// */
// @PostMapping("setFreePeriod")
// public ResultData setFreePeriod(@RequestBody WxRentContract wxRentContract) {
// wxRentContract.updateTenantInfo(getTenantInfo());
// wxRentContractService.saveFreePeriods(wxRentContract);
// return new ResultData();
// }
//
/**
* 新增第二步 防止前端3秒重复提交
* @param wxRentContract
* @return
*/
// @PostMapping("updateMoney")
// public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) {
// logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney");
// if (null != wxRentContract.getDecimalSize() && wxRentContract.getDecimalSize() <= 0 ) {
// wxRentContract.setDecimalSize(Constant.default_short_decimal_size);
// }
// WxRentContract contract = wxRentContractService.selectById(wxRentContract.getId());
// wxRentContract.setRentArea(contract.getRentArea());
//
// MallUserInfo user = getUser();
// wxRentContract.updateTenantInfo(user);
// wxRentContract.setAdjustPeriodHandle();
// wxRentContract.calcutePrice();
// //wxRentContract.setRentPriceHandle();
// wxRentContract.calcuteDepositTotal();
// Date oldDate = wxRentContract.getRentalStartDate();
// if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
// wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
// }
// wxRentContract.setOperationType(null);
// if (null == wxRentContract.getDayPriceCalcute()){
// wxRentContract.setDayPriceCalcute(EnumRentDayPriceCalcute.REAL_DAYS.getCode());
// }
// if (wxRentContract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode().intValue() && null == wxRentContract.getMonthAverageDays()) {
// return new ResultData(Result.ERROR,"请填写月平均天数");
// }
//
// return wxRentContractService.update(wxRentContract, user,user.getName(),EnumFromType.OTHER.getCode(),oldDate,false,true);
// }
// //切换生成账单方式
// @PostMapping("updateRentStartTime")
// public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) {
// MallUserInfo user = getUser();
// wxRentContract.updateTenantInfo(user);
// return wxRentContractService.updateRentStartTime(wxRentContract, user);
// }
/**
* 新增第三步
* @param wxRentContract
* @return
*/
// @PostMapping("updateFile")
// public ResultData updateFile(@RequestBody WxRentContract wxRentContract) {
// logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile");
// MallUserInfo user = getUser();
// wxRentContract.updateTenantInfo(user);
// //wxRentContract.setAdjustPeriodHandle();
// //wxRentContract.setRentPriceHandle();
//// Date oldDate = wxRentContract.getRentalStartDate();
//// if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
//// wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
//// }
// //wxRentContract.setRentShopType(null);
// //wxRentContract.setOperationType(null);
//
// return wxRentContractService.updateFile(wxRentContract, user,user.getName(),true);
// }
// @GetMapping("/findById")
// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
// public ResultData findById(Long id,Integer noBillList) {
// logger.debug("[" + getIpAddr() + "] WxRentContractController::findById");
// // 同步欠缴状态
//// WxAllBill wxBillRent = new WxAllBill();
//// wxBillRent.updateTenantInfo(getTenantInfo());
//// wxBillRentService.updateBillStatus(wxBillRent);
// try {
// Map<String, Object> data = wxRentContractService.getById(id,noBillList);
// return new ResultData(data);
// } catch (MallinkException e) {
// logger.error(e.getMessage());
// return new ResultData(e.getErrorCode(), e.getMessage());
// }
// }
// @PostMapping("update")
// @SystemControllerLog(description = "租赁合同-更新")
// public ResultData update(@RequestBody WxRentContract rentContract) {
// logger.debug("[" + getIpAddr() + "] WxRentContractController::update");
//
// WxRentContract cure = wxRentContractService.getSimpleDeatil(rentContract.getId());
// if (null == cure) {
// return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"租赁合同未查询到");
// }
//
// if (cure.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue()||
// cure.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() ||
// (cure.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue()
// && (cure.getApplyStatus().intValue()== EnumRentContractAppStatus.REJECT.getCode().intValue() ||
// cure.getApplyStatus().intValue()== EnumRentContractAppStatus.SETBACK.getCode().intValue()))) {
// MallUserInfo user = getUser();
// rentContract.updateTenantInfo(user);
// rentContract.setAdjustPeriodHandle();
// //rentContract.setRentPriceHandle();
// Date oldDate = rentContract.getRentalStartDate();
// if(rentContract.getRentStartType()!=null && rentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
// rentContract.setRentalStartDate(rentContract.getStartDate());
// }
//
// try {
// rentContractValidShop(rentContract);
// } catch (Exception e) {
// return new ResultData(Result.ERROR,e.getMessage());
// }
//
// ResultData update = null;
// try {
// update = wxRentContractService.updateOneStep(rentContract, user, user.getName(), EnumFromType.OTHER.getCode(), oldDate,false);
// } catch (MallinkException e) {
// return new ResultData(update.code,update.message);
// }
// return update;
// }else {
// return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),"当前合同状态不允许修改");
// }
// }
/**
* 作废
* @param wxRentContract
@@ -419,130 +206,6 @@ public class WxRentContractController extends WxContractBaseController {
return wxRentContractService.apply(rentContract,user);
}
//续签
@PostMapping("renewal")
public ResultData renewal(@RequestBody WxRentContract wxRentContract) {
if (null == wxRentContract.getId()){
return new ResultData(Result.ERROR, "合同ID不能为空");
}
if (null == wxRentContract.getRentalStartDate() || null == wxRentContract.getRentalEndDate()){
return new ResultData(Result.ERROR, "请选择租赁开始日期和截止日期");
}
if (null == wxRentContract.getStartDate()){
return new ResultData(Result.ERROR, "请选择计租日期");
}
if (null == wxRentContract.getSignDate()){
return new ResultData(Result.ERROR, "请选择签约日期");
}
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId());
if (null == rentContract) {
return new ResultData(Result.ERROR, "未找到租金合同");
}
if (!(rentContract.getRentalEndDate().before(wxRentContract.getRentalStartDate()))) {
return new ResultData(Result.ERROR, "续租合同开始日期要大于原合同截止日期");
}
if (rentContract.getStatus().intValue() == EnumRentContractStatus.UNWRITE.getCode().intValue()) {
return new ResultData(Result.ERROR,"租金合同未完善,请先完善。");
}
MallUserInfo user = getUser();
rentContract.setRentalStartDate(wxRentContract.getRentalStartDate());
rentContract.setRentalEndDate(wxRentContract.getRentalEndDate());
rentContract.setSignDate(wxRentContract.getSignDate());
rentContract.setStartDate(wxRentContract.getStartDate());
rentContract.setEndDate(wxRentContract.getStartDate());
rentContract.setFixStartDate(wxRentContract.getFixStartDate());
rentContract.setFixEndDate(wxRentContract.getFixEndDate());
try {
rentContractValidShop(rentContract);
} catch (Exception e) {
return new ResultData(Result.ERROR,e.getMessage());
}
try {
wxRentContractService.renewal(rentContract,user);
}catch(Exception e) {
logger.error("renewal error.",e);
return new ResultData(Result.ERROR,e.getMessage());
}
return new ResultData(rentContract);
}
//转签
@PostMapping("transfer")
public ResultData transfer(@RequestBody WxRentContract wxRentContract) {
if (null == wxRentContract.getId() || null == wxRentContract.getCustomerType() ||
StringUtils.isBlank(wxRentContract.getCustomerName()) || StringUtils.isBlank(wxRentContract.getCustomerPhone())){
return new ResultData(Result.ERROR, "缺少参数");
}
WxRentContract rentContract = wxRentContractMapper.selectById(wxRentContract.getId());
if (null == rentContract) {
return new ResultData(Result.ERROR, "编号["+wxRentContract.getId()+"]未找到租金合同");
}
MallUserInfo user = getUser();
try {
rentContract.setCustomersId(wxRentContract.getCustomersId());
rentContract.setCustomerType(wxRentContract.getCustomerType());
rentContract.setCustomerName(wxRentContract.getCustomerName());
rentContract.setCustomerLinkPerson(wxRentContract.getCustomerLinkPerson());
rentContract.setCustomerPhone(wxRentContract.getCustomerPhone());
rentContract.setCustomerLegalPerson(wxRentContract.getCustomerLegalPerson());
wxRentContractService.transfer(rentContract,user);
}catch(Exception e) {
logger.error("transfer error.",e);
return new ResultData(Result.ERROR,e.getMessage());
}
return new ResultData(rentContract);
}
// @GetMapping("getRentContractList")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
// @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
// public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract, Integer validStatus, Integer pageNum, Integer pageSize) {
// logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList");
// if (null == wxRentContract) wxRentContract = new WxRentContract();
// wxRentContract.updateTenantInfo(getTenantInfo());
// if (StringUtils.isNotBlank(wxRentContract.getOnlyPropertyContractId()) && (!"undefined".equals(wxRentContract.getOnlyPropertyContractId()))) {
// try {
// Long contractId = Long.parseLong(wxRentContract.getOnlyPropertyContractId());
// if (contractId > 0 ) {
// wxRentContract.setId(contractId);
// }
// } catch (NumberFormatException e) {
// }
//
// } else {
// //正常状态, 物业合同
// if (validStatus != null && 1 == validStatus) {
// wxRentContract.setStatuss(EnumRentContractStatus.getValidStatus());
// //续签的合同,包括正常到期
// }else if (validStatus != null && 2== validStatus) {
// List<Integer> statuss = EnumRentContractStatus.getValidStatus();
// statuss.add(EnumRentContractStatus.OUT_DATE.getCode());
// wxRentContract.setStatuss(statuss);
// }
// }
//
// wxRentContract.setSortColumns(SortField.Createtime_DESC);
// return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize));
// }
@GetMapping("getPayAccountInfo")
@SystemControllerLog(description = "租赁合同-获取甲方账户")
public ResultData getPayAccountInfo() {
@@ -565,31 +228,6 @@ public class WxRentContractController extends WxContractBaseController {
return new ResultData(map);
}
// @GetMapping("/hasRentStatus")
// public ResultData hasRentStatus(@ModelAttribute WxRentContract wxRentContract) {
// logger.debug("[" + getIpAddr() + "] WxRentContractController::hasRentStatus");
// wxRentContract.updateTenantInfo(getTenantInfo());
// return wxRentContractService.hasRentStatus(wxRentContract);
// }

// @GetMapping("/hasContractNumber")
// public ResultData hasContractNumber(@ModelAttribute WxRentContract wxRentContract) {
// logger.debug("[" + getIpAddr() + "] WxRentContractController::hasContractNumber");
// wxRentContract.updateTenantInfo(getTenantInfo());
// return wxRentContractService.hasContractNumber(wxRentContract);
// }
// @GetMapping("getMerchantList")
// @ApiImplicitParams({
// @ApiImplicitParam(name = "shopType", value = "店铺类型 1:店铺 2:多经点位", dataType = "Integer", paramType = "query", required = true)})
// public ResultData getMerchantList(Integer shopType) throws Exception{
// WxMerchant wxMerchant = new WxMerchant();
// wxMerchant.updateTenantInfo(getTenantInfo());
// wxMerchant.setRentShopType(shopType);
// wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode());
// return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getMerchantList(wxMerchant));
// }

@PostMapping("savePayAccountInfo")
public ResultData savePayAccountInfo(@RequestBody WxPayAccountBill payAccountBill) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::savePayAccountInfo");
@@ -612,34 +250,6 @@ public class WxRentContractController extends WxContractBaseController {
return new ResultData();
}

// @GetMapping("/getContractByContractNumber")
// public ResultData getContractByContractNumber(@ModelAttribute WxRentContract wxRentContract) {
// logger.debug("[" + getIpAddr() + "] WxRentContractController::getContractByContractNumber");
// wxRentContract.updateTenantInfo(getTenantInfo());
// return wxRentContractService.getContractByContractNumber(wxRentContract);
// }

// @GetMapping("/init")
// @TenantIgnore
// public ResultData init() {
// List<WxRentContract> clist = wxRentContractService.findList(new WxRentContract());
// for (WxRentContract wrc: clist) {
// List<Long> shopIds = wrc.shopIdsByRentInfo();
// if (null != shopIds) {
// List<WxShop> shops = wxShopService.getByIds(this.getTenantInfo(),shopIds);
// String shopIdstr = "";
// for (WxShop shop : shops) {
// shopIdstr = shopIdstr +","+shop.getId();
// }
// if(!StringUtils.isBlank(shopIdstr)) {
// wrc.setShopIdStr(shopIdstr);
// wxRentContractService.updateRentContract(wrc);
// }
// }
// }
// return new ResultData();
// }
//查询联营扣点,联营取高的合同
@GetMapping("getRevenueContractList")


+ 6
- 6
mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java Просмотреть файл

@@ -179,13 +179,13 @@ public class WxSettleMerchantController extends BaseController {
_np = new BigDecimal(r.getNeedPay());
}
BigDecimal _bmf = new BigDecimal(0);
if (null != r.getBussinessManageFeeNeedPay()) {
_bmf = new BigDecimal(r.getBussinessManageFeeNeedPay());
}
// if (null != r.getBussinessManageFeeNeedPay()) {
// _bmf = new BigDecimal(r.getBussinessManageFeeNeedPay());
// }
BigDecimal _omf = new BigDecimal(0);
if (null != r.getOperatingManageFeeNeedPay()) {
_omf = new BigDecimal(r.getOperatingManageFeeNeedPay());
}
// if (null != r.getOperatingManageFeeNeedPay()) {
// _omf = new BigDecimal(r.getOperatingManageFeeNeedPay());
// }
all = all.add(_np).add(_bmf).add(_omf);
}
Map retMap = new HashMap();


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

@@ -261,12 +261,6 @@ public class WxAllBill extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="最近催缴时间",name="lastOweCallUser")
public String lastOweCallUser;
@io.swagger.annotations.ApiModelProperty(value="租金里面的商业管理费",name="bussinessManageFeeNeedPay")
public String bussinessManageFeeNeedPay;
@io.swagger.annotations.ApiModelProperty(value="租金里面的营业管理费",name="operatingManageFeeNeedPay")
public String operatingManageFeeNeedPay;
@io.swagger.annotations.ApiModelProperty(value = "商铺信息", name = "shopInfo")
public String shopInfo;
@@ -285,10 +279,10 @@ public class WxAllBill extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="主物账单ID(针对合同里面的自定义科目账单)",name="parentBillId")
public Long parentBillId;
@io.swagger.annotations.ApiModelProperty(value="虚拟组合ID(针对店铺拆分用,主账单用)",name="virtualComposeId")
@io.swagger.annotations.ApiModelProperty(value="虚拟组合ID(针对店铺拆分用,主账单用,前端使用)",name="virtualComposeId")
public Long virtualComposeId;
@io.swagger.annotations.ApiModelProperty(value="父虚拟组合ID(针对店铺拆分,自定义科目账单用)",name="parentVirtualComposeId")
@io.swagger.annotations.ApiModelProperty(value="父虚拟组合ID(针对店铺拆分,自定义科目账单用,前端使用)",name="parentVirtualComposeId")
public Long parentVirtualComposeId;
@io.swagger.annotations.ApiModelProperty(value = "能源抄表计算ID", name = "energyReadingCalcuteId")
@@ -338,13 +332,6 @@ public class WxAllBill extends TenantEntity {
return new BigDecimal(getOwe()).add(new BigDecimal(bl)).add(new BigDecimal(serviceChargePay)).setScale(2, RoundingMode.UP).toPlainString();
}
@TableField(exist = false)
private String totalFee;//租金合同创建时,所有的应收费用
public void calcuteTotalFee(Integer decimalSize) {
this.totalFee = new BigDecimal(this.receivePay).add(new BigDecimal(bussinessManageFeeNeedPay)).add(new BigDecimal(operatingManageFeeNeedPay))
.setScale(decimalSize, RoundingMode.HALF_UP).toPlainString();
}
@TableField(exist = false)
public String month;
//EnumBillOweOrNearType 逾期 1, 临期 2


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

@@ -96,12 +96,6 @@ public class WxRentContract extends TenantEntity {
@TableField(exist = false)
private String priceTwoDecimal;//2位小数

@io.swagger.annotations.ApiModelProperty(value = "计费周期", name = "receivePeriod")
private Integer receivePeriod;
@io.swagger.annotations.ApiModelProperty(value = "付款周期(计费周期的倍数)", name = "receivePeriod")
private Integer payPeriodRate;
@io.swagger.annotations.ApiModelProperty(value = "计费周期单位EnumContractReceivePeriodUnit", name = "receivePeriodUnit")
private Integer receivePeriodUnit;
@io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath")
private String filepath;
@io.swagger.annotations.ApiModelProperty(value = "EnumRentContractStatus", name = "status")
@@ -119,22 +113,6 @@ public class WxRentContract extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value = "押金金额详细", name = "cashtypeContentLsit")
private String cashtypeContentLsit;
// public void calcuteDepositTotal() {
// if (StringUtils.isNotBlank(cashtypeContentLsit)) {
// JSONArray rentInfoArray = JSONArray.parseArray(cashtypeContentLsit);
// int size = rentInfoArray.size();
// BigDecimal dt = new BigDecimal(0);
// for (int i = 0; i < size; i++) {
// JSONObject rentInfoObject = rentInfoArray.getJSONObject(i);
// String deposit = rentInfoObject.getString("deposit");
// if (StringUtils.isNotBlank(deposit)) {
// dt = dt.add(new BigDecimal(deposit));
// }
// }
// //this.deposit = dt.toPlainString();
// }
// }

@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel")
private Integer isDel;


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

@@ -48,4 +48,6 @@ public interface WxAgileContractService {
PageInfo<WxContractCustomers> getContractCustomersList(WxContractCustomers record, Integer pageIndex, Integer pageSize);
void renewalAgile(WxRentContract wxRentContract,MallUserInfo user);
void transfer(WxRentContract wxRentContract,MallUserInfo user);
}

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

@@ -123,8 +123,6 @@ public interface WxRentContractService {
void renewal(WxRentContract wxRentContract,MallUserInfo user);
void transfer(WxRentContract wxRentContract,MallUserInfo user);
/**
* 合同正常到期
* @param


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

@@ -950,4 +950,22 @@ public class WxAgileContractServiceImpl implements WxAgileContractService {
return raudi;
}
@Transactional(rollbackFor = {Exception.class})
@Override
public void transfer(WxRentContract rentContract,MallUserInfo user) {
this.setCustomers(rentContract);
rentContract.setUpdatetime(new Date());
rentContract.setUpdateBy(user.getId());
rentContract.setUpdateByName(user.getName());
wxRentContractMapper.updateById(rentContract);
//更新账单归属
WxAllBill bill = new WxAllBill();
bill.updateTenantInfo(rentContract);
bill.setRentContractId(rentContract.getId());
bill.setCusName(rentContract.getCustomerName());
wxAllBillMapper.transferCusName(bill);
}
}

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

@@ -1978,24 +1978,6 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
@Transactional(rollbackFor = {Exception.class})
@Override
public void transfer(WxRentContract rentContract,MallUserInfo user) {
this.setCustomers(rentContract);
rentContract.setUpdatetime(new Date());
rentContract.setUpdateBy(user.getId());
rentContract.setUpdateByName(user.getName());
wxRentContractMapper.updateById(rentContract);
//更新账单归属
WxAllBill bill = new WxAllBill();
bill.updateTenantInfo(rentContract);
bill.setRentContractId(rentContract.getId());
bill.setCusName(rentContract.getCustomerName());
wxAllBillMapper.transferCusName(bill);
}
@Override
public void outDateContract(WxMall wxMall) {
try {


+ 4
- 10
mallinkService/src/main/resources/mapper/WxAllBillMapper.xml Просмотреть файл

@@ -32,8 +32,6 @@
<result column="last_owe_call_time" jdbcType="TIMESTAMP" property="lastOweCallTime"/>
<result column="last_owe_call_user" jdbcType="VARCHAR" property="lastOweCallUser"/>
<result column="bussiness_manage_fee_need_pay" jdbcType="VARCHAR" property="bussinessManageFeeNeedPay"/>
<result column="operating_manage_fee_need_pay" jdbcType="VARCHAR" property="operatingManageFeeNeedPay"/>
<result column="is_preview" jdbcType="INTEGER" property="isPreview"/>
<result column="shop_info" jdbcType="VARCHAR" property="shopInfo"/>
<result column="rent_contract_id" jdbcType="BIGINT" property="rentContractId"/>
@@ -54,7 +52,7 @@
<sql id="allColumns">
`id`,`tenant_id`,`parent_tenant_id`,`shop_id`,`createtime`,`create_by`,`create_by_name`,`updatetime`,`update_by`,`update_by_name`,
`price_detail`,`need_pay`,`receive_pay`,`history_receive_pay`,`pay`,`pay_way`,`pay_date`,`set_off`,`use_money`,`starttime`,`endtime`,`status`,`energy_fees_id`,
`return_pay`,`bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`bussiness_manage_fee_need_pay`,`operating_manage_fee_need_pay`,`receive_date`,`period`,
`return_pay`,`bill_remark`,`last_owe_call_time`,`last_owe_call_user`,`receive_date`,`period`,
`is_preview`,`shop_info`,`rent_contract_id`,`rent_contract_agile_fees_type`,`property_contract_id`,`parent_bill_id`,`virtual_compose_id`,`parent_virtual_compose_id`,
`energy_reading_calcuteId`,`energy_reading_id`,`extra_create_from`,`rent_area`,`can_edit`,`cus_name`,`fees_type`
</sql>
@@ -220,8 +218,6 @@
sum(CAST(ifnull(set_off,'0') AS DECIMAL(20,2))) set_off,
sum(CAST(ifnull(use_money,'0') AS DECIMAL(20,2))) use_money,
sum(CAST(ifnull(return_pay,'0') AS DECIMAL(20,2))) return_pay,
sum(CAST(ifnull(bussiness_manage_fee_need_pay,'0') AS DECIMAL(20,2))) bussiness_manage_fee_need_pay,
sum(CAST(ifnull(operating_manage_fee_need_pay,'0') AS DECIMAL(20,2))) operating_manage_fee_need_pay,
starttime,
endtime,
receive_date,
@@ -240,8 +236,6 @@
sum(CAST(ifnull(set_off,'0') AS DECIMAL(20,2))) set_off,
sum(CAST(ifnull(use_money,'0') AS DECIMAL(20,2))) use_money,
sum(CAST(ifnull(return_pay,'0') AS DECIMAL(20,2))) return_pay,
sum(CAST(ifnull(bussiness_manage_fee_need_pay,'0') AS DECIMAL(20,2))) bussiness_manage_fee_need_pay,
sum(CAST(ifnull(operating_manage_fee_need_pay,'0') AS DECIMAL(20,2))) operating_manage_fee_need_pay,
starttime,
endtime,
receive_date,
@@ -394,12 +388,12 @@
(
#{item.id},#{item.tenantId},#{item.parentTenantId},#{item.shopId},#{item.createtime},
#{item.createBy},#{item.createByName},#{item.updatetime},#{item.updateBy},#{item.updateByName},#{item.priceDetail},
#{item.needPay},#{item.receivePay},#{item.historyReceivePay},#{item.pay},#{item.billType},#{item.payWay},#{item.payDate},#{item.setOff},#{item.useMoney},
#{item.needPay},#{item.receivePay},#{item.historyReceivePay},#{item.pay},#{item.payWay},#{item.payDate},#{item.setOff},#{item.useMoney},
#{item.starttime},#{item.endtime},#{item.status},#{item.energyFeesId},#{item.returnPay},#{item.billRemark},
#{item.lastOweCallTime},#{item.lastOweCallUser},#{item.bussinessManageFeeNeedPay},#{item.operatingManageFeeNeedPay},
#{item.lastOweCallTime},#{item.lastOweCallUser},
#{item.receiveDate},#{item.period},#{item.isPreview},#{item.shopInfo},#{item.rentContractId},#{item.rentContractAgileFeesType},#{item.propertyContractId},
#{item.parentBillId},#{item.virtualComposeId},#{item.parentVirtualComposeId},#{item.energyReadingCalcuteId},
#{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea},#{item.canEdit},#{item.cusName}
#{item.energyReadingId},#{item.extraCreateFrom},#{item.rentArea},#{item.canEdit},#{item.cusName},#{item.feesType}
)
</foreach>
</insert>


+ 2
- 8
mallinkService/src/main/resources/mapper/WxRentContractMapper.xml Просмотреть файл

@@ -10,9 +10,6 @@
<result column="rental_start_date" jdbcType="TIMESTAMP" property="rentalStartDate"/>
<result column="rental_end_date" jdbcType="TIMESTAMP" property="rentalEndDate"/>
<result column="sign_date" jdbcType="TIMESTAMP" property="signDate"/>
<result column="receive_period" jdbcType="INTEGER" property="receivePeriod"/>
<result column="receive_period_unit" jdbcType="INTEGER" property="receivePeriodUnit"/>
<result column="pay_period_rate" jdbcType="INTEGER" property="payPeriodRate"/>
<result column="filepath" jdbcType="VARCHAR" property="filepath"/>
<result column="status" jdbcType="INTEGER" property="status"/>
<result column="contract_number" jdbcType="VARCHAR" property="contractNumber"/>
@@ -51,14 +48,14 @@

<sql id="allColumns">
`id`,`customers_id`,`tenant_id`,`parent_tenant_id`,
`decimal_size`,`rental_start_date`,`rental_end_date`,`sign_date`,`receive_period`,`receive_period_unit`,
`decimal_size`,`rental_start_date`,`rental_end_date`,`sign_date`,
`filepath`,`status`,`contract_number`,`create_by`,`update_by`,
`day_price_calcute`,`month_average_days`,`free_period_remark`,
cashtype_content_lsit,`is_del`,`revenue_jumps_remark`,
`updatetime`,`createtime`,`link_person`,`link_phone`,`link_address`,
`pay_account`,`lease`,`type`,
`start_date`,`end_date`,`from_id`,`end_contract_time`,
`apply_status`,`bank_name`,`fix_start_date`,`fix_end_date`,`pay_period_rate`,`create_by_name`,`update_by_name`,
`apply_status`,`bank_name`,`fix_start_date`,`fix_end_date`,`create_by_name`,`update_by_name`,
`rent_info`, `file_names`,
shop_id_str,
design_file,remark
@@ -80,9 +77,6 @@
)
</if>
<if test=" null != signDate and '' != signDate">and `sign_date` = #{signDate}</if>
<if test=" null != receivePeriod and '' != receivePeriod">and `receive_period` = #{receivePeriod}</if>
<if test=" null != receivePeriodUnit and '' != receivePeriodUnit">and `receive_period_unit` = #{receivePeriodUnit}</if>
<if test=" null != payPeriodRate and '' != payPeriodRate">and `pay_period_rate` = #{payPeriodRate}</if>
<if test=" null != tenantId and '' != tenantId">
and `tenant_id` = #{tenantId}
</if>


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