From f60c64bf7b998c9e68edad17ffefaba18f4de2d8 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Sat, 9 Nov 2024 21:31:56 +0800 Subject: [PATCH] fix --- .../contract/WxAgileContractController.java | 6 -- .../WxRentPropertyContractController.java | 3 - .../controller/WxMallAdminController.java | 60 ++++++++----------- 3 files changed, 24 insertions(+), 45 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java index 8cadbfc84..7376111d7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxAgileContractController.java @@ -85,9 +85,6 @@ public class WxAgileContractController extends WxContractBaseController { wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); } - if (null == wxRentContract.getIsPrivateMerchant()) { - wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); - } PageInfo page = wxAgileContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null; if (null != page && null != page.getList()) { @@ -116,9 +113,6 @@ public class WxAgileContractController extends WxContractBaseController { MallUserInfo user = getUser(); wxRentContract.updateTenantInfo(user); wxRentContract.setAgileType(EnumRentAgileType.AGILE.getCode()); - if (null == wxRentContract.getMerchantId()) { - return new ResultData(Result.ERROR,"请选择商户"); - } if (null == wxRentContract.getDayPriceCalcute()) { return new ResultData(Result.ERROR,"请选择日均单价计费规则"); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 40a2780a6..d870c4650 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -61,9 +61,6 @@ public class WxRentPropertyContractController extends WxContractBaseController { wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopTypes()); } - if (null == wxRentPropertyContractVo.getIsPrivateMerchant()) { - wxRentPropertyContractVo.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); - } PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); Integer hasFlow = null; if (null != page && null != page.getList()) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index db4fa6792..96035d976 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -200,11 +200,11 @@ public class WxMallAdminController extends BaseController { } private List getHots(Integer nearBillBeforeDays) { - WxMerchant wxMerchant = new WxMerchant(); - setQueryDataRule(wxMerchant); - wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); - wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); - return billAllHelper.getHotNotify(wxMerchant); + WxShop wxShop = new WxShop(); + setQueryDataRule(wxShop); + wxShop.setOweBillBeforeDays(getOweBillBeforeDays()); + wxShop.setNearBillBeforeDays(nearBillBeforeDays); + return billAllHelper.getHotNotify(wxShop); } //逾期账单 @@ -221,48 +221,36 @@ public class WxMallAdminController extends BaseController { @ApiOperation("分类查询账单") @GetMapping("listBill") - public ResultData listBill(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue, Integer pageNum, Integer pageSize) { - setQueryDataRule(wxMerchant); - if (null != wxMerchant.getOnlyOweOrNear()) { - if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxMerchant.getOnlyOweOrNear().intValue()) { - wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); - }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxMerchant.getOnlyOweOrNear().intValue()) { - wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); - wxMerchant.setNearBillBeforeDays(getNearBillBeforeDays()); + public ResultData listBill(@ModelAttribute WxShop wxShop,Integer billTypeValue, Integer pageNum, Integer pageSize) { + setQueryDataRule(wxShop); + if (null != wxShop.getOnlyOweOrNear()) { + if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxShop.getOnlyOweOrNear().intValue()) { + wxShop.setOweBillBeforeDays(getOweBillBeforeDays()); + }else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == wxShop.getOnlyOweOrNear().intValue()) { + wxShop.setOweBillBeforeDays(getOweBillBeforeDays()); + wxShop.setNearBillBeforeDays(getNearBillBeforeDays()); } } - return new ResultData(billAllHelper.getBillList( wxMerchant,pageNum,pageSize)); + return new ResultData(billAllHelper.getBillList( wxShop,pageNum,pageSize)); } @ApiOperation("账单详情") @GetMapping("detail") - public ResultData detail(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue,Long billId) { - if (null == wxMerchant) { - wxMerchant = new WxMerchant(); - } - setQueryDataRule(wxMerchant); - if (null == billTypeValue || null == billId) { - return new ResultData(Result.ERROR,"参数错误"); + public ResultData detail(@ModelAttribute WxShop wxShop,Integer billTypeValue,Long billId) { + if (null == wxShop) { + wxShop = new WxShop(); } - EnumBillAllType btype; - if (billTypeValue.intValue() == Constant.bill_all_type_manage_fee) { - btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; - }else { - btype = EnumBillAllType.getEnum(billTypeValue); - if (null == btype) { - return new ResultData(Result.ERROR,"分类非法"); - } - } - return new ResultData(billAllHelper.getBillDetail(btype, wxMerchant,billId)); + setQueryDataRule(wxShop); + return new ResultData(billAllHelper.getBillDetail(wxShop,billId)); } //账单汇总 @GetMapping("billSum") - public ResultData billSum(@ModelAttribute WxMerchant wxMerchant) { - setQueryDataRule(wxMerchant); - Date starttime = wxMerchant.getStarttime(); - Date enttime = wxMerchant.getEndtime(); - WxBillSum rentSum = billAllHelper.getBillSum(wxMerchant,starttime, enttime); + public ResultData billSum(@ModelAttribute WxShop wxShop) { + setQueryDataRule(wxShop); + Date starttime = wxShop.getStarttime(); + Date enttime = wxShop.getEndtime(); + WxBillSum rentSum = billAllHelper.getBillSum(wxShop,starttime, enttime); Map retMap = new HashMap(); retMap.put("needPay", rentSum.getNeedPay()); retMap.put("paid", rentSum.getPaid());