diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 65f7380b3..29728740f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -44,6 +44,7 @@ import com.iformall.service.WxPayAccountBillService; import com.iformall.service.WxShopService; import com.iformall.service.helper.WxBillAllHelper; import com.iformall.utils.Constant; +import com.iformall.utils.DateUtils; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -127,6 +128,9 @@ public class WxAllBillController extends BillBaseController { private PageInfo getVoPage(WxMerchant wxMerchant,Integer pageNum, Integer pageSize , Integer billStaus) { Date starttime = wxMerchant.getStarttime(); Date enttime = wxMerchant.getEndtime(); + if (null != enttime) { + enttime = DateUtils.getDayEnd(enttime); + } wxMerchant.setStarttime(null); wxMerchant.setEndtime(null); if (null != wxMerchant.getOnlyOwe() && EnumYesOrNo.YES.getCode().intValue() == wxMerchant.getOnlyOwe().intValue()) { @@ -205,6 +209,9 @@ public class WxAllBillController extends BillBaseController { wxMerchant.updateTenantInfo(getTenantInfo()); Date starttime = wxMerchant.getStarttime(); Date enttime = wxMerchant.getEndtime(); + if (null != enttime) { + enttime = DateUtils.getDayEnd(enttime); + } wxMerchant.setStarttime(null); wxMerchant.setEndtime(null); WxMerchant m = wxMerchantService.selectById(wxMerchant.getId()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index 03d478bbd..505704980 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -251,9 +251,7 @@ public class WxRentContract extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") private String deposit; -//// @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "depositInfo") -//// private String depositInfo; - @io.swagger.annotations.ApiModelProperty(value = "押金详细EnumRentContractDepositType", name = "cashtypeContentLsit") + @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeContentLsit") private String cashtypeContentLsit; @io.swagger.annotations.ApiModelProperty(value = "押金详细", name = "cashtypeLsit") private String cashtypeLsit; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 87536a438..fd2cd467d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -812,7 +812,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { wxBillDeposit.setPriceDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName()); } wxBillDeposit.setPay("0"); - String needpay = wxRentContract.getDeposit(); + String needpay = depositFee.getPrice(); + // String count = "1"; // if (null != depositFee.getCalcuteUnit() && depositFee.getCalcuteUnit().intValue() == EnumFeesStandardsCalcuteUnit.MM.getCode().intValue()) { // count = wxRentContract.getRentArea();