diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index 57087b3cb..6f62cb480 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; @RestController @RequestMapping("wxMerchantMicroPay") -@Api(description = "B端收银台相关接口") +@Api(description = "收银台相关接口") public class WxMerchantMicroPayController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java index 67100d735..0c8f98888 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSettleMerchantController.java @@ -4,15 +4,28 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxBillProperty; +import com.iformall.domain.po.WxBillRent; +import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxSettleMerchant; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.enums.EnumRentContractStatus; import com.iformall.enums.EnumYesOrNo; import com.iformall.exception.MallinkException; +import com.iformall.mapper.WxBillPropertyMapper; +import com.iformall.service.WxBillRentService; +import com.iformall.service.WxPropertyContractService; +import com.iformall.service.WxRentContractService; +import com.iformall.service.WxRentPropertyContractService; import com.iformall.service.WxSettleMerchantService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; + +import java.util.List; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -29,6 +42,14 @@ public class WxSettleMerchantController extends BaseController { @Autowired private WxSettleMerchantService wxSettleMerchantService; + @Autowired + private WxRentContractService wxRentContractService; + @Autowired + private WxBillRentService wxBillRentService; + @Autowired + WxPropertyContractService wxPropertyContractService; + @Autowired + WxBillPropertyMapper wxBillPropertyMapper; @ApiOperation("分页列表接口") @GetMapping("list") @@ -103,6 +124,91 @@ public class WxSettleMerchantController extends BaseController { wxSettleMerchantService.exportData(record, request, response); } - - + @ApiOperation("查询合同租金") + @GetMapping("/rentMoney") + public ResultData rentMoney(@ModelAttribute WxSettleMerchant wxSettleMerchant) { + if (null == wxSettleMerchant.getMerchantId() || null == wxSettleMerchant.getBeginTime() || null == wxSettleMerchant.getEndTime()) { + return new ResultData(Result.ERROR,"参数错误"); + } + //查询计租中的合同 + WxRentContract wxRentContract = new WxRentContract(); + wxRentContract.updateTenantInfo(getTenantInfo()); + wxRentContract.setMerchantId(wxSettleMerchant.getMerchantId()); + wxRentContract.setStatus(EnumRentContractStatus.PAING.getCode()); + List rlist = wxRentContractService.findList(wxRentContract); + if (null == rlist || rlist.size() <= 0 ) { + return new ResultData(Result.ERROR,"无计租中租金合同"); + } + WxRentContract rent = rlist.get(0); + WxBillRent br = new WxBillRent(); + br.setMerchantId(wxSettleMerchant.getMerchantId()); + br.setRentContractId(rent.getId()); + br.setStarttime(wxSettleMerchant.getBeginTime()); + br.setEndtime(wxSettleMerchant.getEndTime()); + + PageInfo rpage = wxBillRentService.findByRentContractId(br, 1, 1000); + if (null == rpage || null == rpage.getList() || rpage.getList().size() <= 0 ) { + return new ResultData(Result.ERROR,"租金合同无对应账单"); + } + Long all = 0L; + List blist = rpage.getList(); + for (int i = 0 ; i < blist.size() ; i ++) { + WxBillRent r = blist.get(i); + Long _np = 0L; + if (null != r.getNeedPay()) { + _np = r.getNeedPay(); + } + Long _bmf = 0L; + if (null != r.getBussinessManageFeeNeedPay()) { + _bmf = r.getBussinessManageFeeNeedPay(); + } + Long _omf = 0L; + if (null != r.getOperatingManageFeeNeedPay()) { + _omf = r.getOperatingManageFeeNeedPay(); + } + all = all + _np + _bmf + _omf; + } + + return new ResultData(all); + } + + @ApiOperation("查询物业租金") + @GetMapping("/propertyMoney") + public ResultData propertyMoney(@ModelAttribute WxSettleMerchant wxSettleMerchant) { + if (null == wxSettleMerchant.getMerchantId() || null == wxSettleMerchant.getBeginTime() || null == wxSettleMerchant.getEndTime()) { + return new ResultData(Result.ERROR,"参数错误"); + } + //查询计租中的合同 + WxPropertyContract wxPropertyContract = new WxPropertyContract(); + wxPropertyContract.updateTenantInfo(getTenantInfo()); + wxPropertyContract.setMerchantId(wxSettleMerchant.getMerchantId()); + wxPropertyContract.setStatus(EnumRentContractStatus.PAING.getCode()); + List rlist = wxPropertyContractService.findList(wxPropertyContract); + if (null == rlist || rlist.size() <= 0 ) { + return new ResultData(Result.ERROR,"无计租中物业合同"); + } + WxPropertyContract property = rlist.get(0); + WxBillProperty br = new WxBillProperty(); + br.setMerchantId(wxSettleMerchant.getMerchantId()); + br.setPropertyContractId(property.getId()); + br.setStarttime(wxSettleMerchant.getBeginTime()); + br.setEndtime(wxSettleMerchant.getEndTime()); + + List blist = wxBillPropertyMapper.queryBillPropertyList(br); + if (null == blist || blist.size() <= 0 ) { + return new ResultData(Result.ERROR,"物业合同无对应账单"); + } + Long all = 0L; + for (int i = 0 ; i < blist.size() ; i ++) { + WxBillProperty r = blist.get(i); + Long _np = 0L; + if (null != r.getNeedPay()) { + _np = r.getNeedPay(); + } + all = all + _np; + } + + return new ResultData(all); + } + }