|
|
|
@@ -2,19 +2,19 @@ package com.iformall.controller.contract; |
|
|
|
|
|
|
|
import com.iformall.annotation.SystemControllerLog; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.IdWorker; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.enums.EnumBillAction; |
|
|
|
import com.iformall.enums.EnumFromType; |
|
|
|
import com.iformall.enums.EnumIsPreview; |
|
|
|
import com.iformall.enums.EnumRentStartType; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.mapper.WxBillActionMapper; |
|
|
|
import com.iformall.mapper.WxRentContractMapper; |
|
|
|
import com.iformall.service.WxBillRentService; |
|
|
|
import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.service.WxPayAccountBillService; |
|
|
|
import com.iformall.service.WxRentContractService; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
@@ -48,6 +49,42 @@ public class WxRentContractController extends BaseController { |
|
|
|
@Autowired |
|
|
|
private WxRentContractMapper wxRentContractMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxBillActionMapper wxBillActionMapper; |
|
|
|
@Autowired |
|
|
|
private WxBillPropertyService wxBillPropertyService; |
|
|
|
@GetMapping("test") |
|
|
|
@SystemControllerLog(description = "获取两个时间相差,返回n月零n天") |
|
|
|
public ResultData test(String startDate, String endDate) throws Exception{ |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
List<WxBillRent> billRentList = wxBillRentService.findLatePayBill(); |
|
|
|
for (WxBillRent wxBillRent : billRentList) { |
|
|
|
WxBillAction billAction = new WxBillAction(); |
|
|
|
billAction.setId(idWorker.nextId()); |
|
|
|
billAction.setCreatetime(new Date()); |
|
|
|
billAction.setUserName("系统端"); |
|
|
|
billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); |
|
|
|
billAction.setBillId(wxBillRent.getId()); |
|
|
|
BigDecimal divide = new BigDecimal(wxBillRent.getOwe()).multiply(new BigDecimal(wxBillRent.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); |
|
|
|
billAction.setDetails("系统计入"+ divide.toString()+"元"); |
|
|
|
wxBillActionMapper.insertSelective(billAction); |
|
|
|
} |
|
|
|
|
|
|
|
List<WxBillProperty> billPropertyList = wxBillPropertyService.findLatePayBill(); |
|
|
|
for (WxBillProperty wxBillRent : billPropertyList) { |
|
|
|
WxBillAction billAction = new WxBillAction(); |
|
|
|
billAction.setId(idWorker.nextId()); |
|
|
|
billAction.setCreatetime(new Date()); |
|
|
|
billAction.setUserName("系统端"); |
|
|
|
billAction.setAction(EnumBillAction.UPDATE_LATE_PAY_MONEY.getCode()); |
|
|
|
billAction.setBillId(wxBillRent.getId()); |
|
|
|
BigDecimal divide = new BigDecimal(wxBillRent.getOwe()).multiply(new BigDecimal(wxBillRent.getLatePayRatio())).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); |
|
|
|
billAction.setDetails("系统计入"+ divide.toString()+"元"); |
|
|
|
wxBillActionMapper.insertSelective(billAction); |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("getDateDiff") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "startDate", value = "开始时间", dataType = "string", paramType = "query", required = true), |
|
|
|
|