Browse Source

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

release_toaliyun_real
xiaohu 1 year ago
parent
commit
678fd4fb88
5 changed files with 11 additions and 5 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  2. +4
    -1
      mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -256,7 +256,7 @@ public class WxPropertyContract extends TenantEntity {
private Integer createType;
@io.swagger.annotations.ApiModelProperty(value = "店铺ids,根据店铺创建", name = "shopIds")
private String shopIds;
@io.swagger.annotations.ApiModelProperty(value = "店铺号,根据店铺创建", name = "shopNumbers")
@io.swagger.annotations.ApiModelProperty(value = "店铺号", name = "shopNumbers")
private String shopNumbers;
@TableField(exist = false)
private List<Long> shopIdsQuery;


+ 4
- 1
mallinkService/src/main/java/com/iformall/service/helper/WxEnergyHelper.java View File

@@ -65,6 +65,7 @@ public class WxEnergyHelper {
}
addComponent(retList, "商场总计租面积", "{#totalArea#}");
addComponent(retList, "店铺公摊系数", "{#shopPublicRax#}");
addComponent(retList, "铺位面积", "{#shopArea#}");
return retList;
}
@@ -146,10 +147,11 @@ public class WxEnergyHelper {
}else {
formula = formula.replaceAll("#shopPublicRax#", shop.getPulicRate());
}
formula = formula.replaceAll("#shopArea#", shop.getOperationArea());
return formula;
}
public void testCalcute(String formula,String shopPulicRax) {
public void testCalcute(String formula,String shopPulicRax,String shopArea) {
if (StringUtils.isBlank(formula)) {
return ;
}
@@ -163,6 +165,7 @@ public class WxEnergyHelper {
}
}
formula = formula.replaceAll("#shopPublicRax#", shopPulicRax);
formula = formula.replaceAll("#shopArea#", shopArea);
FormulaParser.evaluate(formula);
}


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

@@ -783,7 +783,7 @@ public class WxEnergyServiceImpl implements WxEnergyService {
msf.setFormulaListStr(JSON.toJSONString(record.getFormulaList()));
}
msf.setFormula(record.getFormula());
wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate());
wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate(),shop.getOperationArea());
wxEnergyFeesShopMapper.insert(msf);
}
}
@@ -826,7 +826,7 @@ public class WxEnergyServiceImpl implements WxEnergyService {
if (StringUtils.isBlank(shop.getPulicRate())) {
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"店铺未设置公摊系数");
}
wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate());
wxEnergyHelper.testCalcute(record.getFormula(),shop.getPulicRate(),shop.getOperationArea());
wxEnergyFeesShopMapper.updateById(record);
}


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

@@ -437,6 +437,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
record.setCreateType(wxPropertyContract.getCreateType());
record.setShopIds(wxPropertyContract.getShopIds());
record.setFeeStandards(wxPropertyContract.getFeesStardarsList());
record.setShopNumbers(wxPropertyContract.getShopNumbers());
List<WxAllBill> billList = buildProperty(new WxMerchant(),user,record,EnumIsPreview.YES.getCode(),true);
record.setPreviewBillRentList(billList);
}
@@ -572,6 +573,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
//wxBillDeposit.setUpdateByName(user.getName());
wxBillDeposit.setRentShopType(wxPropertyContract.getRentShopType());
wxBillDeposit.setShopInfo(getShopInfoStr(wxPropertyContract));
wxBillDeposit.setShopNumber(wxPropertyContract.getShopNumbers());
wxBillDeposit.setRentArea(wxPropertyContract.getRentArea());
wxBillDeposit.setEnergyFeesId(EnumBillAllType.PROPERTY_DEPOSIT.getEnergyFeesId());
try {
@@ -878,6 +880,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
if (shopInfo != null) {
wxBillProperty.setShopInfo(JSONObject.toJSONString(shopInfo));
}
wxBillProperty.setShopNumber(wxPropertyContract.getShopNumbers());
wxBillProperty.setRentArea(wxPropertyContract.getRentArea());
//wxBillProperty.setLatePayRatio(0);
wxBillProperty.setTotalFee(new BigDecimal(needpay).add(new BigDecimal(standarsTotal)).toPlainString());


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

@@ -1682,7 +1682,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
while (true) {
BillTimeVo timeVo = new BillTimeVo();
//账单日
//账单日
Calendar instance = Calendar.getInstance();
instance.setTime(start);
instance.set(Calendar.MILLISECOND, 0);


Loading…
Cancel
Save