From fe6c7d4a071fd1dc46ccbd8df983d31a1a473199 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 3 Jan 2023 12:40:41 +0800 Subject: [PATCH] fix bug --- .../iformall/domain/vo/WxCouponOrderBVo.java | 7 ++++ .../com/iformall/mapper/WxShopMapper.java | 1 + .../service/impl/WxChartServiceImpl.java | 37 +++++++++++++----- .../impl/WxCouponOrderServiceImpl.java | 16 +++++++- .../contract-word-template/~$ll_owe.docx | Bin 162 -> 0 bytes .../main/resources/mapper/WxShopMapper.xml | 6 +++ 6 files changed, 56 insertions(+), 11 deletions(-) delete mode 100644 mallinkService/src/main/resources/contract-word-template/~$ll_owe.docx diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 76edc599f..9fd91dec9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -294,5 +294,12 @@ public class WxCouponOrderBVo extends WxCouponOrder { @Excel(name = "配送状态", width = 50, orderNum = "18", replace = {"线上购买_0", "待自提_10", "待自提_14", "已自提_15", "待发货_20", "待收货_24", "已收货_25"}) @io.swagger.annotations.ApiModelProperty(value="配送状态 0:默认(无) 1*:自提 2*:配送",name="shippingStatus") private Integer shippingStatus; + + //券上架时间 + @TableField(exist = false) + private Date couponOnlineStartDate; + @TableField(exist = false) + private Date couponOnlineEndDate; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java index 7a6eb713a..a7ffee9cc 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxShopMapper.java @@ -17,6 +17,7 @@ public interface WxShopMapper extends CommonMapper { List findList(WxShop wxShop); List findIdList(WxShop wxShop); + Long findAreaSum(WxShop wxShop); List> findListMap(WxShop record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index f7666a6b9..7966aca91 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -234,6 +234,7 @@ public class WxChartServiceImpl implements WxChartDataService { String tenantId = paramsMap.get("tenantId"); String parentTenantId = paramsMap.get("parentTenantId"); Integer chart = Integer.valueOf(paramsMap.get("chart")); + Integer chartByArea = Integer.valueOf(paramsMap.get("chartByArea")); String startdate = paramsMap.get("startdate"); String enddate = paramsMap.get("enddate"); @@ -258,7 +259,11 @@ public class WxChartServiceImpl implements WxChartDataService { //出租率 if (chart.equals(EnumChart.CZL.getCode())) { - return getRentRate(tenantEntity); + if (null != chartByArea) { + return getRentRate(tenantEntity,false); + }else { + return getRentRate(tenantEntity,true); + } } //租金收缴率 if (chart.equals(EnumChart.ZJSJL.getCode())) { @@ -2683,17 +2688,29 @@ public class WxChartServiceImpl implements WxChartDataService { * 出租率 * @param tenantEntity */ - private ResultData getRentRate(TenantEntity tenantEntity) { + private ResultData getRentRate(TenantEntity tenantEntity,boolean byArea) { HashMap datamap = new HashMap<>(); - WxShop wxShop = new WxShop(); - wxShop.updateTenantInfo(tenantEntity); - wxShop.setStatus(EnumShopStatus.RENT.getCode()); - List yczlist = wxShopMapper.findList(wxShop); - wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); - List wczlist = wxShopMapper.findList(wxShop); //出租与未出租 - int yczsize = yczlist.size(); - int wczsize = wczlist.size(); + int yczsize = 0; + int wczsize = 0; + if (byArea) { + WxShop wxShop = new WxShop(); + wxShop.updateTenantInfo(tenantEntity); + wxShop.setStatus(EnumShopStatus.RENT.getCode()); + yczsize = wxShopMapper.findAreaSum(wxShop).intValue(); + wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); + wczsize = wxShopMapper.findAreaSum(wxShop).intValue(); + }else { + WxShop wxShop = new WxShop(); + wxShop.updateTenantInfo(tenantEntity); + wxShop.setStatus(EnumShopStatus.RENT.getCode()); + List yczlist = wxShopMapper.findList(wxShop); + wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode()); + List wczlist = wxShopMapper.findList(wxShop); + yczsize = yczlist.size(); + wczsize = wczlist.size(); + } + int size = yczsize + wczsize; if (size == 0) { datamap.put("yczsl", 0); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index d7aa69b3b..5054390b9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1280,7 +1280,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List couponIds = null; String title = StringUtils.trimToNull(wxCouponOrder.getTitle()); - if (null != wxCouponOrder.getCouponId() || null != title || null != wxCouponOrder.getType() || null != wxCouponOrder.getBusiness() || null != wxCouponOrder.getSourceType()) { + if (null != wxCouponOrder.getCouponId() || null != title || null != wxCouponOrder.getType() || null != wxCouponOrder.getBusiness() || null != wxCouponOrder.getSourceType() + || null != wxCouponOrder.getCouponOnlineStartDate() || null != wxCouponOrder.getCouponOnlineEndDate() ) { WxCoupon wxCouponQuery = new WxCoupon(); wxCouponQuery.updateTenantInfo(wxCouponOrder); wxCouponQuery.setId(wxCouponOrder.getCouponId()); @@ -1288,6 +1289,19 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { wxCouponQuery.setType(wxCouponOrder.getType()); wxCouponQuery.setBusiness(wxCouponOrder.getBusiness()); wxCouponQuery.setSourceType(wxCouponOrder.getSourceType()); + if (null != wxCouponOrder.getCouponOnlineStartDate() || null != wxCouponOrder.getCouponOnlineEndDate() ) { + WxCouponChannel wxCouponChannelQ = new WxCouponChannel(); + wxCouponChannelQ.updateTenantInfo(wxCouponOrder); + wxCouponChannelQ.setStartdate(wxCouponOrder.getCouponOnlineStartDate()); + wxCouponChannelQ.setEnddate(wxCouponOrder.getCouponOnlineEndDate()); + List ccIds = wxCouponChannelMapper.findCouponIdList(wxCouponChannelQ); + if (null == ccIds || ccIds.size() <= 0 ) { + wxCouponOrder.setId(-999L); + return; + }else { + wxCouponQuery.setIds(ccIds); + } + } couponIds = wxCouponMapper.findIdList(wxCouponQuery); if (null == couponIds || couponIds.size() <= 0) { //throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"根据券条件搜索不到券信息。"); diff --git a/mallinkService/src/main/resources/contract-word-template/~$ll_owe.docx b/mallinkService/src/main/resources/contract-word-template/~$ll_owe.docx deleted file mode 100644 index fcd42e3fa9819ae3c2e99e74ae57ff52b9d59275..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 xcmd;eOv%m6%PcM_N-W7QVjvRmGB`4%Fyu01GUNeqF+&MM5kn%7%m>oc1^`8%3f%wz diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 3fc4171f7..52648fc7d 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -162,6 +162,12 @@ from wx_shop + +