Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
2696a93984
3 zmienionych plików z 5 dodań i 2 usunięć
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxPropertyContract.java Wyświetl plik

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


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Wyświetl plik

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


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Wyświetl plik

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


Ładowanie…
Anuluj
Zapisz