diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index e55c50dc2..171191ae1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -256,9 +256,9 @@ public class WxFinanceController extends BaseController { if (null == record.getMerchantId()) { return new ResultData(Result.ERROR,"请选择商户"); } - if (!this.isValidPayTime(record.getReceiveDate())) { - return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); - } +// if (!this.isValidPayTime(record.getReceiveDate())) { +// return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); +// } wxFinanceService.createTempFees(record,this.getUser()); return new ResultData(); } @@ -346,9 +346,9 @@ public class WxFinanceController extends BaseController { if (null == record.getMerchantId()) { return new ResultData(Result.ERROR,"请选择商户"); } - if (!this.isValidPayTime(record.getReceiveDate())) { - return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); - } +// if (!this.isValidPayTime(record.getReceiveDate())) { +// return new ResultData(Result.ERROR,"支付时间请在结账截止时间之后"); +// } wxFinanceService.createTempToPay(record,this.getUser()); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index 0539b5e9e..45b2dcf4c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -1182,11 +1182,11 @@ public class WxFinanceServiceImpl implements WxFinanceService { record.setBillType(fees.getBillType()); WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId()); if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) { - generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE,record.getReceivePay(),"0",record.getReceiveDate()); + generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE,record.getReceivePay(),"0",record.getStarttime(),record.getEndtime()); }else if (fees.getBillType().intValue() == EnumBillAllType.OTHER_DEPOSIT.getCode().intValue()) { - generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT,record.getReceivePay(),"0",record.getReceiveDate()); + generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT,record.getReceivePay(),"0",record.getStarttime(),record.getEndtime()); }else if (fees.getBillType().intValue() == EnumBillAllType.OTHER.getCode().intValue()) { - generateTempBill(record, merchant, user,EnumBillAllType.OTHER,record.getReceivePay(),"0",record.getReceiveDate()); + generateTempBill(record, merchant, user,EnumBillAllType.OTHER,record.getReceivePay(),"0",record.getStarttime(),record.getEndtime()); } } @@ -1195,10 +1195,23 @@ public class WxFinanceServiceImpl implements WxFinanceService { WxEnergyFees fees = wxEnergyService.getFeesById(record.getEnergyFeesId(),record.getTenantId()) ; record.setBillType(fees.getBillType()); WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId()); - generateTempBill(record, merchant, user,EnumBillAllType.TEMP_TO_PAYMERCHANT,"0",record.getReceivePay(),record.getReceiveDate()); + generateTempBill(record, merchant, user,EnumBillAllType.TEMP_TO_PAYMERCHANT,"0",record.getReceivePay(),record.getStarttime(),record.getEndtime()); } - public void generateTempBill(WxAllBill record,WxMerchant merchant,MallUserInfo user, EnumBillAllType billType,String receivePay,String pay,Date receiveDate) { + public void generateTempBill(WxAllBill record,WxMerchant merchant,MallUserInfo user, EnumBillAllType billType,String receivePay,String pay,Date starttime,Date endtime) { + if (null == endtime) { + if (null == starttime) { + Date cur = new Date(); + starttime = DateUtils.getFirstDayForCurrMonth(cur); + endtime = DateUtils.getLastDayForMonth(cur); + }else { + endtime = DateUtils.getLastDayForMonth(starttime); + } + }else { + if (null == starttime) { + starttime = DateUtils.getFirstDayForCurrMonth(endtime); + } + } WxAllBill advanceBill = new WxAllBill(); advanceBill.updateTenantInfo(record); advanceBill.setMerchantId(merchant.getId()); @@ -1209,10 +1222,10 @@ public class WxFinanceServiceImpl implements WxFinanceService { advanceBill.setUseMoney("0"); advanceBill.setBillType(billType.getCode()); //advanceBill.setPayWay(); - advanceBill.setPayDate(receiveDate); - advanceBill.setStarttime(DateUtils.getDayBegin(receiveDate)); - advanceBill.setEndtime(DateUtils.getDayEnd(receiveDate)); - advanceBill.setReceiveDate(advanceBill.getStarttime()); + advanceBill.setPayDate(new Date()); + advanceBill.setStarttime(starttime); + advanceBill.setEndtime(endtime); + advanceBill.setReceiveDate(starttime); //advanceBill.setStatus(billStatus.getCode()); advanceBill.setEnergyFeesId(record.getEnergyFeesId()); advanceBill.setIsPreview(EnumYesOrNo.NO.getCode());