| @@ -9,10 +9,13 @@ import com.iformall.domain.po.WxPropertyContract; | |||||
| import com.iformall.domain.po.WxRentContract; | import com.iformall.domain.po.WxRentContract; | ||||
| import com.iformall.domain.po.WxSettleMerchant; | import com.iformall.domain.po.WxSettleMerchant; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.enums.EnumRentContractStatus; | import com.iformall.enums.EnumRentContractStatus; | ||||
| import com.iformall.enums.EnumYesOrNo; | import com.iformall.enums.EnumYesOrNo; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| import com.iformall.service.WxAgileContractService; | |||||
| import com.iformall.service.WxAllBillService; | import com.iformall.service.WxAllBillService; | ||||
| import com.iformall.service.WxMerchantService; | |||||
| import com.iformall.service.WxPropertyContractService; | import com.iformall.service.WxPropertyContractService; | ||||
| import com.iformall.service.WxRentContractService; | import com.iformall.service.WxRentContractService; | ||||
| import com.iformall.service.WxRentPropertyContractService; | import com.iformall.service.WxRentPropertyContractService; | ||||
| @@ -45,11 +48,15 @@ public class WxSettleMerchantController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxSettleMerchantService wxSettleMerchantService; | private WxSettleMerchantService wxSettleMerchantService; | ||||
| @Autowired | @Autowired | ||||
| private WxMerchantService wxMerchantService; | |||||
| @Autowired | |||||
| private WxRentContractService wxRentContractService; | private WxRentContractService wxRentContractService; | ||||
| @Autowired | @Autowired | ||||
| private WxAllBillService wxAllBillService; | private WxAllBillService wxAllBillService; | ||||
| @Autowired | @Autowired | ||||
| WxPropertyContractService wxPropertyContractService; | WxPropertyContractService wxPropertyContractService; | ||||
| @Autowired | |||||
| WxAgileContractService wxAgileContractService; | |||||
| @ApiOperation("分页列表接口") | @ApiOperation("分页列表接口") | ||||
| @GetMapping("list") | @GetMapping("list") | ||||
| @@ -136,10 +143,22 @@ public class WxSettleMerchantController extends BaseController { | |||||
| if (null == wxSettleMerchant.getMerchantId() || null == wxSettleMerchant.getBeginTime() || null == wxSettleMerchant.getEndTime()) { | if (null == wxSettleMerchant.getMerchantId() || null == wxSettleMerchant.getBeginTime() || null == wxSettleMerchant.getEndTime()) { | ||||
| return new ResultData(Result.ERROR,"参数错误"); | return new ResultData(Result.ERROR,"参数错误"); | ||||
| } | } | ||||
| TenantEntity tenantEntity = getTenantInfo(); | |||||
| //根据商户查询店铺 | |||||
| List<Long> shopIds = wxMerchantService.getMerchantShopIds(wxSettleMerchant.getMerchantId()); | |||||
| if (null == shopIds || shopIds.size() <= 0 ) { | |||||
| return new ResultData(Result.ERROR,"商户未查询到店铺"); | |||||
| } | |||||
| //根据铺位查询 | |||||
| List<Long> contractIds = wxAgileContractService.findShopContractIds(wxSettleMerchant, shopIds); | |||||
| if (null == contractIds || contractIds.size() <= 0 ) { | |||||
| return new ResultData(Result.ERROR,"未查询到合同"); | |||||
| } | |||||
| //查询计租中的合同 | //查询计租中的合同 | ||||
| WxRentContract wxRentContract = new WxRentContract(); | WxRentContract wxRentContract = new WxRentContract(); | ||||
| wxRentContract.updateTenantInfo(getTenantInfo()); | |||||
| wxRentContract.setMerchantId(wxSettleMerchant.getMerchantId()); | |||||
| wxRentContract.updateTenantInfo(tenantEntity); | |||||
| //wxRentContract.setMerchantId(wxSettleMerchant.getMerchantId()); | |||||
| wxRentContract.setIds(contractIds); | |||||
| wxRentContract.setStatus(EnumRentContractStatus.PAING.getCode()); | wxRentContract.setStatus(EnumRentContractStatus.PAING.getCode()); | ||||
| List<WxRentContract> rlist = wxRentContractService.findList(wxRentContract); | List<WxRentContract> rlist = wxRentContractService.findList(wxRentContract); | ||||
| if (null == rlist || rlist.size() <= 0 ) { | if (null == rlist || rlist.size() <= 0 ) { | ||||
| @@ -147,7 +166,7 @@ public class WxSettleMerchantController extends BaseController { | |||||
| } | } | ||||
| WxRentContract rent = rlist.get(0); | WxRentContract rent = rlist.get(0); | ||||
| WxAllBill br = new WxAllBill(); | WxAllBill br = new WxAllBill(); | ||||
| br.setMerchantId(wxSettleMerchant.getMerchantId()); | |||||
| br.setShopIdList(shopIds); | |||||
| br.setRentContractId(rent.getId()); | br.setRentContractId(rent.getId()); | ||||
| br.setStarttime(wxSettleMerchant.getBeginTime()); | br.setStarttime(wxSettleMerchant.getBeginTime()); | ||||
| br.setEndtime(wxSettleMerchant.getEndTime()); | br.setEndtime(wxSettleMerchant.getEndTime()); | ||||
| @@ -186,10 +205,21 @@ public class WxSettleMerchantController extends BaseController { | |||||
| if (null == wxSettleMerchant.getMerchantId() || null == wxSettleMerchant.getBeginTime() || null == wxSettleMerchant.getEndTime()) { | if (null == wxSettleMerchant.getMerchantId() || null == wxSettleMerchant.getBeginTime() || null == wxSettleMerchant.getEndTime()) { | ||||
| return new ResultData(Result.ERROR,"参数错误"); | return new ResultData(Result.ERROR,"参数错误"); | ||||
| } | } | ||||
| TenantEntity tenantEntity = getTenantInfo(); | |||||
| //根据商户查询店铺 | |||||
| List<Long> shopIds = wxMerchantService.getMerchantShopIds(wxSettleMerchant.getMerchantId()); | |||||
| if (null == shopIds || shopIds.size() <= 0 ) { | |||||
| return new ResultData(Result.ERROR,"商户未查询到店铺"); | |||||
| } | |||||
| //根据铺位查询 | |||||
| List<Long> contractIds = wxAgileContractService.findShopContractIds(wxSettleMerchant, shopIds); | |||||
| if (null == contractIds || contractIds.size() <= 0 ) { | |||||
| return new ResultData(Result.ERROR,"未查询到合同"); | |||||
| } | |||||
| //查询计租中的合同 | //查询计租中的合同 | ||||
| WxPropertyContract wxPropertyContract = new WxPropertyContract(); | WxPropertyContract wxPropertyContract = new WxPropertyContract(); | ||||
| wxPropertyContract.updateTenantInfo(getTenantInfo()); | wxPropertyContract.updateTenantInfo(getTenantInfo()); | ||||
| wxPropertyContract.setMerchantId(wxSettleMerchant.getMerchantId()); | |||||
| wxPropertyContract.setIds(contractIds); | |||||
| wxPropertyContract.setStatus(EnumRentContractStatus.PAING.getCode()); | wxPropertyContract.setStatus(EnumRentContractStatus.PAING.getCode()); | ||||
| List<WxPropertyContract> rlist = wxPropertyContractService.findList(wxPropertyContract); | List<WxPropertyContract> rlist = wxPropertyContractService.findList(wxPropertyContract); | ||||
| if (null == rlist || rlist.size() <= 0 ) { | if (null == rlist || rlist.size() <= 0 ) { | ||||
| @@ -197,7 +227,7 @@ public class WxSettleMerchantController extends BaseController { | |||||
| } | } | ||||
| WxPropertyContract property = rlist.get(0); | WxPropertyContract property = rlist.get(0); | ||||
| WxAllBill br = new WxAllBill(); | WxAllBill br = new WxAllBill(); | ||||
| br.setMerchantId(wxSettleMerchant.getMerchantId()); | |||||
| br.setShopIdList(shopIds); | |||||
| br.setPropertyContractId(property.getId()); | br.setPropertyContractId(property.getId()); | ||||
| br.setStarttime(wxSettleMerchant.getBeginTime()); | br.setStarttime(wxSettleMerchant.getBeginTime()); | ||||
| br.setEndtime(wxSettleMerchant.getEndTime()); | br.setEndtime(wxSettleMerchant.getEndTime()); | ||||