Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
5380b6f022
3 changed files with 8 additions and 8 deletions
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java
  3. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java View File

@@ -190,10 +190,9 @@ public class WxPropertyContractController extends WxContractBaseController {
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(),false);
}

//物业合同-更新租赁开始日期
//物业合同-最后一步切换 按什么日期生成账单
@PostMapping("updateRentStartTime")
public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime");
WxPropertyContract propertyContract = wxPropertyContractMapper.selectById(wxPropertyContract.getId());
MallUserInfo user = getUser();
propertyContract.updateTenantInfo(user);
@@ -211,7 +210,7 @@ public class WxPropertyContractController extends WxContractBaseController {
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(),false);
}

@PostMapping("update-第三步")
@PostMapping("update-第三步提交")
public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update");
MallUserInfo user = getUser();
@@ -222,6 +221,7 @@ public class WxPropertyContractController extends WxContractBaseController {
if (null != wxPropertyContract.getFeeStandards() && wxPropertyContract.getFeeStandards().size() > 0 ) {
wxPropertyContract.setFeesStandardsInfo(JSON.toJSONString(wxPropertyContract.getFeeStandards()));
}
wxPropertyContract.setPreviewBillRentList(null);
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(),true);

}


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxBillProperty.java View File

@@ -159,7 +159,7 @@ public class WxBillProperty extends WxBillBaseEntity {
@Override
public String getBillRemark() {
return "";
return comments;
}
@Override


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

@@ -734,7 +734,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
}

++billcount;
WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,userId,billcount,shopInfo,standarsTotal);
WxBillProperty wxBillProperty = generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,billTimeVo.getStartDate(),billTimeVo.getEndDate(),billTimeVo.getReceiveDate(),needpay,userId,billcount,shopInfo,standarsTotal,"");
wxBillProperty.setUnFixedbillFeesStandardsList(unFixedList);
resultList.add(wxBillProperty);
@@ -773,11 +773,11 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
private WxBillProperty generateBillPropertyByBillStandards(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Long userId,WxBillFeesStandardsListVo svo,
Integer billcount,Map<String, Object> shopInfo) {
return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),userId,billcount,shopInfo,"0");
return generateBillProperty(wxPayAccountBill,wxPropertyContract,isPreview,svo.getStart(),svo.getEnd(),svo.getReceiveDate(),svo.getTotal(),userId,billcount,shopInfo,"0",svo.getBillName());
}
private WxBillProperty generateBillProperty(WxPayAccountBill wxPayAccountBill,WxPropertyContract wxPropertyContract,Integer isPreview,Date start,Date end,Date receiveDate,String needpay,
Long userId,Integer billcount,Map<String, Object> shopInfo,String standarsTotal) {
Long userId,Integer billcount,Map<String, Object> shopInfo,String standarsTotal,String remark) {
final IdWorker idWorker = IdWorker.get();
WxBillProperty wxBillProperty = new WxBillProperty();
wxBillProperty.setIsPreview(isPreview);
@@ -810,7 +810,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
}
wxBillProperty.setLatePayRatio(0);
wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString());
wxBillProperty.setComments(remark);

//计算手续费
BigDecimal servicePay = new BigDecimal(wxBillProperty.getReceivePay()).multiply(new BigDecimal(wxPayAccountBill.getServiceChargeRate())).divide(new BigDecimal(100), wxPropertyContract.getDecimalSize(), BigDecimal.ROUND_HALF_UP);


Loading…
Cancel
Save