diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java index b56e3709f..f2df6a49b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java @@ -23,7 +23,6 @@ public class WxChartDataController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired private WxChartDataService wxChartDataService; @@ -31,7 +30,9 @@ public class WxChartDataController extends BaseController { @GetMapping("/queryData") @ApiImplicitParams({ @ApiImplicitParam(name = "chart", value = "chart", dataType = "String", paramType = "query", required = true), - @ApiImplicitParam(name = "querytime", value = "querytime", dataType = "String", paramType = "query", required = true)}) + @ApiImplicitParam(name = "startdate", value = "startdate", dataType = "String", paramType = "query"), + @ApiImplicitParam(name = "enddate", value = "enddate", dataType = "String", paramType = "query") + }) public ResultData queryData(@RequestParam Map params) { logger.debug("[" + getIpAddr() + "] WxChartDataController::queryData"); params.put("tenantId",super.getTenantId()); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index 84bc28bdf..2bffb0df8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -157,6 +157,25 @@ public class WxCouponController extends BaseController { return new ResultData(wxCouponService.findCouponData(wxCoupon,pageNum,pageSize)); } + @ApiOperation("砍价营销列表接口") + @GetMapping("findPressCountList") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData findPressCountList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { + //默认时间本月第一天,截止到当天 + Map result = new HashedMap(); + if(wxCoupon.getStartdate() == null){ + Calendar c = Calendar.getInstance(); + c.add(Calendar.MONTH, 0); + c.set(Calendar.DAY_OF_MONTH,1); + wxCoupon.setStartdate(c.getTime()); + } + if(wxCoupon.getEnddate() == null){ + wxCoupon.setEnddate(new Date()); + } + return new ResultData(wxCouponService.findPressData(wxCoupon,pageNum,pageSize)); + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 0947bead8..1454d0f71 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -1,7 +1,5 @@ package com.iformall.domain.po; -import org.springframework.format.annotation.DateTimeFormat; - import javax.persistence.Id; import javax.persistence.Table; import javax.persistence.Transient; diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 994f107c3..14f636e6a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -43,6 +43,15 @@ public interface WxCouponService { */ PageInfo findCouponData(WxCoupon record,Integer pageNum, Integer pageSize); + /** + * 砍价列表,包括统计 + * @param record + * @param pageNum + * @param pageSize + * @return + */ + PageInfo findPressData(WxCoupon record,Integer pageNum, Integer pageSize); + /** * 根据Id获得实体 * @@ -105,7 +114,7 @@ public interface WxCouponService { * 卷发放数量 * @return */ - List findCouponSendCount(WxCoupon wxCoupon); + //List findCouponSendCount(WxCoupon wxCoupon); /** * 卷购买数量 @@ -117,7 +126,7 @@ public interface WxCouponService { * 卷领取数量 * @return */ - List findCouponGetCount(WxCoupon wxCoupon); + //List findCouponGetCount(WxCoupon wxCoupon); /** * 卷核销数量 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java index 046ce7538..bc3562f15 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarPayRecordServiceImpl.java @@ -2,6 +2,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.IdWorker; import com.iformall.domain.po.WxCarPayRecord; import com.iformall.mapper.WxCarPayRecordMapper; import com.iformall.service.WxCarPayRecordService; @@ -25,6 +26,8 @@ public class WxCarPayRecordServiceImpl implements WxCarPayRecordService{ @Override public void saveOrUpdate(WxCarPayRecord record) { if (record.getId() == null) { + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); wxCarPayRecordMapper.insertSelective(record); } else { wxCarPayRecordMapper.updateByPrimaryKeySelective(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 e2607cdff..96a2e9e35 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -67,18 +67,14 @@ public class WxChartServiceImpl implements WxChartDataService { public ResultData queryData(Map paramsMap) { String tenantId = paramsMap.get("tenantId"); Integer chart = Integer.valueOf(paramsMap.get("chart")); - String querytime = paramsMap.get("querytime"); - String startdate = DateUtils.getSystemTime("yyyy-MM-dd"); - String enddate = startdate; - if (!StringUtils.isEmpty(querytime)) { - String[] split = querytime.split(","); - if (split.length == 2) { - startdate = split[0]; - enddate = split[1]; - } else { - startdate = split[0]; - enddate = split[0]; - } + String startdate = paramsMap.get("startdate") + " 00:00:00"; + String enddate = paramsMap.get("enddate") + " 23:59:59"; + + if (StringUtils.isEmpty(startdate)) { + startdate = DateUtils.getSystemTime("yyyy-MM-dd") + " 00:00:00" ; + } + if(StringUtils.isBlank(enddate)){ + enddate = DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59"; } //出租率 @@ -1472,23 +1468,25 @@ public class WxChartServiceImpl implements WxChartDataService { //卡营销数据 if (chart.equals(EnumChart.SALE_CARD.getCode())) { WxCoupon wxCoupon = new WxCoupon(); + //默认时间本月第一天,截止到当天 - Map result = new HashedMap(); - if(startdate == null){ + if(paramsMap.get("startdate") == null){ Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); wxCoupon.setStartdate(c.getTime()); }else{ - Date startTime = DateUtils.stringToDate(startdate + " 00:00:00"); + Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(enddate == null){ - wxCoupon.setEnddate(new Date()); + if(paramsMap.get("enddate") == null){ + wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); }else{ - Date endTime = DateUtils.stringToDate(enddate + " 23:59:59"); + Date endTime = DateUtils.stringToDate(enddate); wxCoupon.setEnddate(endTime); } + + Map result = new HashedMap(); List saleMoneyList = wxCouponService.findSaleMoneyByDate(wxCoupon); List paymentList = wxCouponService.findPaymentByDate(wxCoupon); Map saleMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); @@ -1508,49 +1506,40 @@ public class WxChartServiceImpl implements WxChartDataService { return new ResultData(result); } - //卡营销数据 + //卷营销数据 if (chart.equals(EnumChart.SALE_COUPON.getCode())) { WxCoupon wxCoupon = new WxCoupon(); - //默认时间本月第一天,截止到当天 Map result = new HashedMap(); - if(startdate == null){ + + //默认时间本月第一天,截止到当天 + if(paramsMap.get("startdate") == null){ Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH,1); wxCoupon.setStartdate(c.getTime()); }else{ - Date startTime = DateUtils.stringToDate(startdate + " 00:00:00"); + Date startTime = DateUtils.stringToDate(startdate); wxCoupon.setStartdate(startTime); } - if(enddate == null){ - wxCoupon.setEnddate(new Date()); + if(paramsMap.get("enddate") == null){ + wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); }else{ - Date endTime = DateUtils.stringToDate(enddate + " 23:59:59"); + Date endTime = DateUtils.stringToDate(enddate); wxCoupon.setEnddate(endTime); } - List sendList = wxCouponService.findCouponSendCount(wxCoupon); List orderCountList = wxCouponService.findCouponOrderCount(wxCoupon); - List getCountList = wxCouponService.findCouponGetCount(wxCoupon); List paymentCountList = wxCouponService.findCouponPaymentCount(wxCoupon); List priceCouponSaleCountList = wxCouponService.priceCouponSaleCount(wxCoupon); List priceCouponPaymentCountList = wxCouponService.priceCouponPaymentCount(wxCoupon); - Map sendMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); Map orderCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map getCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); Map paymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); Map priceCouponSaleCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); Map priceCouponPaymentCountMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - for (WxCoupon coupon:sendList){ - sendMap.put(coupon.getXtime(),coupon.getXcount()); - } for (WxCoupon coupon:orderCountList){ orderCountMap.put(coupon.getXtime(),coupon.getXcount()); } - for (WxCoupon coupon:getCountList){ - getCountMap.put(coupon.getXtime(),coupon.getXcount()); - } for (WxCoupon coupon:paymentCountList){ paymentCountMap.put(coupon.getXtime(),coupon.getXcount()); } @@ -1560,9 +1549,7 @@ public class WxChartServiceImpl implements WxChartDataService { for (WxCoupon coupon:priceCouponPaymentCountList){ priceCouponPaymentCountMap.put(coupon.getXtime(),coupon.getXcount()); } - result.put("sendList",sendMap); result.put("orderCountList",orderCountMap); - result.put("getCountList",getCountMap); result.put("paymentCountList",paymentCountMap); result.put("priceCouponSaleCountList",priceCouponSaleCountMap); result.put("priceCouponPaymentCountList",priceCouponPaymentCountMap); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 6899ec5f0..ac9cae763 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -354,20 +354,11 @@ public class WxCouponServiceImpl implements WxCouponService { return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCouponMapper.findCouponData(record)); } - @Override - public List findCouponSendCount(WxCoupon wxCoupon) { - return wxCouponMapper.findCouponSendCount(wxCoupon); - } - @Override public List findCouponOrderCount(WxCoupon wxCoupon) { return wxCouponMapper.findCouponOrderCount(wxCoupon); } - @Override - public List findCouponGetCount(WxCoupon wxCoupon) { - return wxCouponMapper.findCouponGetCount(wxCoupon); - } @Override public List findCouponPaymentCount(WxCoupon wxCoupon) { @@ -398,4 +389,10 @@ public class WxCouponServiceImpl implements WxCouponService { public Long findSumSubsidyMoney(WxCoupon wxCoupon) { return wxCouponMapper.findSumSubsidyMoney(wxCoupon); } + + + @Override + public PageInfo findPressData(WxCoupon record, Integer pageNum, Integer pageSize) { + return null; + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java index 981c72fcb..0c27aeeda 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.iformall.common.IdWorker; import com.iformall.domain.po.*; import com.iformall.mapper.*; import com.iformall.service.WxMsgRecordService; @@ -20,14 +21,17 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { @Override public void save(BaseMsg data) { + final IdWorker idWorker = IdWorker.get(); data.setUuid(UUID.randomUUID().toString()); if(data instanceof WxMsgRecord){ WxMsgRecord msgRecord = (WxMsgRecord)data; msgRecord.setMsgJson(JsonUtil.obj2Json(data)); + msgRecord.setId(idWorker.nextId()); wxMsgRecordMapper.save(msgRecord); }else if(data instanceof WxMsg || data instanceof MailMsg){ WxMsgRecord msgRecord = new WxMsgRecord(); msgRecord.setMsgJson(JsonUtil.obj2Json(data)); + msgRecord.setId(idWorker.nextId()); wxMsgRecordMapper.save(msgRecord); } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index c52f84e07..0a3b84d59 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -730,8 +730,11 @@ (select count(distinct wco.id) from wx_coupon wc,wx_coupon_order wco where wco.coupon_id = wc.id and wco.coupon_order_status = 1 and wc.id = c.id) as payment_count, (select count(distinct wco.id) from wx_coupon wc,wx_coupon_order wco where wco.coupon_id = wc.id and wco.coupon_order_status = 3 and wc.id = c.id) as backpay_count from wx_coupon c where 1=1 - - and c.type = #{type} + + and c.sale_price > 0 + + + and c.sale_price = 0 and c.id = #{id} @@ -739,32 +742,32 @@ order by status asc,create_date desc - - + - select DATE_FORMAT(wco.create_date,'%Y-%m-%d') xtime,count(wco.id) xcount from wx_coupon c left join wx_coupon_order wco on c.id = wco.coupon_id where 1=1 and wco.create_date between #{startdate} and #{enddate} - and wco.coupon_price = 0 group by xtime + +