From 4fdc2f8a8f1a00b4af40fe9e8e2df3b0b6398b99 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 20 Mar 2019 19:14:00 +0800 Subject: [PATCH 01/20] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E5=88=B8=E8=B7=B3=E8=BD=AC=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxScreenAdServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java index 97a156407..d6c61d953 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java @@ -12,6 +12,8 @@ import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxScreenAd; import com.iformall.domain.vo.WxCouponCVo; +import com.iformall.enums.EnumCouponChannelType; +import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumScreenAdType; import com.iformall.mapper.WxCampaignMapper; import com.iformall.mapper.WxCouponChannelMapper; @@ -143,6 +145,7 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { try { record.setQrcode(getQrcode(record.getTargetId(), record.getType().intValue(), + record.getSubType().intValue(), wxAppinfoService.getCAppInfo(record.getTenantId()))); }catch (Exception e) { logger.error("QRCODE set Error:"+e.getMessage()); @@ -157,8 +160,9 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { private static String QRCODE_JUMP_CMD_HOME = "JH"; private static String QRCODE_JUMP_CMD_COUPON = "JC"; + private static String QRCODE_JUMP_CMD_GROUP = "JG"; private static String QRCODE_JUMP_CMD_CAMPGIN = "JB"; - private byte[] getQrcode(Long id, int type, WxAppinfo appInfo) throws Exception { + private byte[] getQrcode(Long id, int type, int subType, WxAppinfo appInfo) throws Exception { if(appInfo == null) { logger.error("QRCODE get error: appinfo is null"); return null; @@ -166,8 +170,13 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { WxMaService wxMaService = MaUtil.getWeappService(appInfo); String scene = ""; - if (EnumScreenAdType.COUPON.getCode().equals(type)) - scene = QRCODE_JUMP_CMD_COUPON+":"+id.toString(); + if (EnumScreenAdType.COUPON.getCode().equals(type)) { + if (EnumCouponChannelType.COUPON_CHANNEL_ID_ORDER_GROUP.getCode().equals(subType)) { + scene = QRCODE_JUMP_CMD_GROUP + ":" + id.toString(); + } else { + scene = QRCODE_JUMP_CMD_COUPON + ":" + id.toString(); + } + } else if (EnumScreenAdType.CAMPAIGN.getCode().equals(type)) scene = QRCODE_JUMP_CMD_CAMPGIN+":"+id.toString(); else From d59ff9eee0d0d805127ca20f44c02ccb1ee3719d Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 10:23:37 +0800 Subject: [PATCH 02/20] =?UTF-8?q?[=E8=AE=BE=E5=A4=87][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E9=85=8D=E7=BD=AE=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/domain/po/WxDevice.java | 12 ++++++++++++ .../src/main/resources/mapper/WxDeviceMapper.xml | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java index b62f16b2a..4df4f4afc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java @@ -92,6 +92,10 @@ public class WxDevice implements Serializable { @io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="hbCmd") private Integer hbCmd; + /**设备名**/ + @io.swagger.annotations.ApiModelProperty(value="设备配置",name="config") + private String config; + public String getTenantId() { return tenantId; } @@ -195,6 +199,14 @@ public class WxDevice implements Serializable { this.hbCmd = hbCmd; } + public String getConfig() { + return config; + } + + public void setConfig(String config) { + this.config = config; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml index 0050312eb..c33a30a69 100644 --- a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml @@ -16,10 +16,11 @@ + - `id`, `tenant_id`, `device_id`, `type`, `status`, `location`, `name`, `version`, `create_date`, `update_date`, `online_status`, `first_hb_time`, `last_hb_time`, `hb_cmd` + `id`, `tenant_id`, `device_id`, `type`, `status`, `location`, `name`, `version`, `create_date`, `update_date`, `online_status`, `first_hb_time`, `last_hb_time`, `hb_cmd`, `config` @@ -82,6 +83,10 @@ and `hb_cmd` = #{hbCmd} + + and `config` = #{config} + + and id in From b79d1548fe540d3b58d57d43bd31479141c1c87b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 21 Mar 2019 10:34:41 +0800 Subject: [PATCH 03/20] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/WxChartServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f0dc4a23f..7e4fe044f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1640,9 +1640,9 @@ public class WxChartServiceImpl implements WxChartDataService { if (StringUtils.isEmpty(paramsMap.get("enddate"))) { params.put("enddate", endTime); } else { + endTime = DateUtils.stringToDate(paramsMap.get("enddate") + " 23:59:59", "yyyy-MM-dd HH:mm:ss"); params.put("enddate", paramsMap.get("enddate") + " 23:59:59"); } - List> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); List> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params); From 4812f18477e9bcfedeb590c99e34181bf00e22a2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 21 Mar 2019 11:05:35 +0800 Subject: [PATCH 04/20] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/WxCouponMapper.xml | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 8c9ae624f..02703ffa6 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -730,17 +730,18 @@ left join wx_card_transfer_info wcs on wcs.coupon_order_id = ci.id where wc.id = c.id) as transfer_count, - (select sum(ci.sale_amount) from wx_card_info ci + (select sum(ci.sale_amount/100) from wx_card_info ci left join wx_coupon wc on wc.id = ci.coupon_id where wc.id = c.id) as sale_amount, - (select sum(wcs.payment) from wx_card_info ci + (select sum(wcs.deduction_amount/100) from wx_card_info ci left join wx_coupon wc on wc.id = ci.coupon_id left join wx_card_spend wcs on wcs.card_id = ci.id where wc.id = c.id) as sum_payment, - (select sum(wc.subsidy_num) from wx_coupon wc - left join wx_coupon_order wco on wc.id = wco.coupon_id + (select sum(sc.subsidy) from wx_card_info ci + left join wx_coupon wc on wc.id = ci.coupon_id + left join wx_merchant_subsidy sc on sc.coupon_order_id = ci.id where wc.id = c.id) as sum_subsidy from wx_coupon c where c.type = 100 @@ -755,9 +756,11 @@ (select count(wco.id) from wx_coupon_order wco where wco.coupon_id = c.id) as sale_count, (select count(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(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, - (select sum(wc.subsidy_num) from wx_coupon wc - left join wx_coupon_order wco on wc.id = wco.coupon_id + (select sum(sc.subsidy/100) from wx_coupon wc + left join wx_coupon_order wo on wo.coupon_id = wc.id + left join wx_merchant_subsidy sc on sc.coupon_order_id = wo.id where wc.id = c.id) as sum_subsidy + from wx_coupon c where c.type not in(8,9,100) and c.sale_price > 0 @@ -777,9 +780,11 @@ left join wx_order wo on wo.product_id = wc.id left join wx_order_press wop on wop.order_id = wo.id where wop.first = 1 and wc.id = c.id) as press_count, + (select count(wo.id) from wx_coupon wc left join wx_order wo on wo.product_id = wc.id where wo.order_status = 7 and wc.id = c.id) as press_succ_count, + (select count(wop.id) from wx_coupon wc left join wx_order wo on wo.product_id = wc.id left join wx_order_press wop on wop.order_id = wo.id @@ -795,11 +800,7 @@ left join wx_order wo on wo.product_id = wc.id left join wx_order_press wop on wop.order_id = wo.id where wop.first = 1 and wc.id = c.id) - *100,2) as payment_rate, - - (select sum(wc.subsidy_num) from wx_coupon wc - left join wx_order wo on wo.product_id = wc.id - where wo.order_status = 7 and wc.id = c.id) as sum_subsidy + *100,2) as payment_rate from wx_coupon c where c.type = 8 @@ -859,13 +860,13 @@ From 15b9711cfec81c4c546d0975abf4bade14830cfe Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 21 Mar 2019 11:19:43 +0800 Subject: [PATCH 05/20] =?UTF-8?q?[=E6=B8=A0=E9=81=93][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=A4=E6=96=AD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponChannelMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index ca576200d..763822fe3 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -39,8 +39,8 @@ and cc.`type` = #{type} - - + + and cc.`title` like concat('%', #{title},'%') From f9d16d9495f261f11a8e0131e01074e582825bc4 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 21 Mar 2019 11:32:04 +0800 Subject: [PATCH 06/20] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 02703ffa6..cd82d5ae3 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -680,7 +680,7 @@ - update wx_order set order_status=#{orderStatus} where tenant_id=#{tenantId} and order_group_id=#{orderGroupId} + update wx_order set order_status=#{orderStatus} where tenant_id=#{tenantId} and order_group_id=#{orderGroupId} and order_status=10 From 6d033aa549fa78364377c9ff14390314199c7ec3 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 13:15:04 +0800 Subject: [PATCH 08/20] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=AF=E9=85=8D=E7=BD=AE=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxDeviceController.java | 13 ++--- .../WxDeviceScreenAdController.java | 2 +- .../com/iformall/service/WxDeviceService.java | 3 +- .../service/impl/WxDeviceServiceImpl.java | 54 ++++++++++++++++++- 4 files changed, 63 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java index bdd04a1ad..718d34061 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java @@ -53,8 +53,8 @@ public class WxDeviceController extends BaseController { wxDevice.setStatus(EnumDeviceStatus.VALID.getCode()); wxDevice.setOnlineStatus(EnumDeviceOnlineStatus.OFFLINE.getCode()); wxDevice.setTenantId(getTenantId()); - wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(); + + return wxDeviceService.saveOrUpdate(wxDevice); } @ApiOperation("更新设备") @@ -65,8 +65,8 @@ public class WxDeviceController extends BaseController { if (wxDevice.getId() == null) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); wxDevice.setTenantId(getTenantId()); - wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(); + + return wxDeviceService.saveOrUpdate(wxDevice); } @ApiOperation("设备详情") @@ -90,8 +90,9 @@ public class WxDeviceController extends BaseController { wxDevice.setId(id); wxDevice.setTenantId(getTenantId()); wxDevice.setStatus(EnumDeviceStatus.INVALID.getCode()); - wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(); + + return wxDeviceService.saveOrUpdate(wxDevice); + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java index afc554af7..a8bdb8e52 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java @@ -95,7 +95,7 @@ public class WxDeviceScreenAdController extends BaseController { wxDevice.setLastHbTime(new Date()); wxDevice.setVersion(paramMap.get("version")); wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(wxDevice); + return new ResultData(wxDevice.getConfig()); } @ApiOperation("基础信息") diff --git a/mallinkService/src/main/java/com/iformall/service/WxDeviceService.java b/mallinkService/src/main/java/com/iformall/service/WxDeviceService.java index 4b0dec811..b8a71c7b1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxDeviceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxDeviceService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxDevice; import java.util.List; @@ -34,7 +35,7 @@ public interface WxDeviceService { * * @param record */ - void saveOrUpdate(WxDevice record); + ResultData saveOrUpdate(WxDevice record); /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java index 49a721965..4a2794b97 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java @@ -1,11 +1,15 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxDevice; import com.iformall.enums.EnumDeviceStatus; +import com.iformall.enums.EnumDeviceType; import com.iformall.mapper.WxDeviceMapper; import com.iformall.service.WxDeviceService; import org.slf4j.Logger; @@ -24,6 +28,14 @@ public class WxDeviceServiceImpl implements WxDeviceService { @Autowired WxDeviceMapper wxDeviceMapper; + final String DEVICE_DEFAULT_CONFIG_SCREEN_AD = "{" + + "\"heartBeatIntervel\":300000," + //5MIN + "\"dataRefreshIntervel\":3600000," + //1HOUR + "\"pageChangeInterval\":10000," + //10SEC + "\"animationTheme\":0" + + "}"; + + @Override public PageInfo listAsPage(WxDevice record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxDeviceMapper.findList(record)); @@ -34,20 +46,60 @@ public class WxDeviceServiceImpl implements WxDeviceService { return wxDeviceMapper.selectByPrimaryKey(id); } + + private String getDefaultConfig(int type) { + + if (type == EnumDeviceType.SCREEN.getCode()) { + return DEVICE_DEFAULT_CONFIG_SCREEN_AD; + } + return null; + } + + private boolean checkConfig(int type, String config) { + JSONObject jConfig; + try { + jConfig = JSONObject.parseObject(config); + } catch (Exception e) { + return false; + } + + if (type == EnumDeviceType.SCREEN.getCode()) { + Integer heartBeatIntervel = jConfig.getInteger("heartBeatIntervel"); + Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshIntervel"); + Integer pageChangeInterval = jConfig.getInteger("pageChangeInterval"); + Integer animationTheme = jConfig.getInteger("animationTheme"); + if (heartBeatIntervel == null || + dataRefreshIntervel == null || + pageChangeInterval == null || + animationTheme == null) { + return false; + } + } + return true; + } + @Override - public void saveOrUpdate(WxDevice record) { + public ResultData saveOrUpdate(WxDevice record) { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreateDate(new Date()); record.setUpdateDate(new Date()); + record.setConfig(getDefaultConfig(record.getType())); wxDeviceMapper.insertSelective(record); } else { record.setUpdateDate(new Date()); + if (record.getConfig() != null) { + if (!checkConfig(record.getType(),record.getConfig())) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } + } wxDeviceMapper.updateByPrimaryKeySelective(record); } + return new ResultData(); } + @Override public void deleteById(Long id) { wxDeviceMapper.deleteByPrimaryKey(id); From ccb678ce114796c3cb949fb734c0e3b3af304ad5 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 13:51:47 +0800 Subject: [PATCH 09/20] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=BF=83=E8=B7=B3=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxDeviceScreenAdController.java | 8 +++++++- .../com/iformall/service/impl/WxDeviceServiceImpl.java | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java index a8bdb8e52..9421bc17a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -95,7 +96,12 @@ public class WxDeviceScreenAdController extends BaseController { wxDevice.setLastHbTime(new Date()); wxDevice.setVersion(paramMap.get("version")); wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(wxDevice.getConfig()); + + Map result = new HashMap<>(); + result.put("config",wxDevice.getConfig()); + result.put("name", wxDevice.getName()); + result.put("location", wxDevice.getLocation()); + return new ResultData(result); } @ApiOperation("基础信息") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java index 4a2794b97..efca8b262 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java @@ -29,8 +29,8 @@ public class WxDeviceServiceImpl implements WxDeviceService { WxDeviceMapper wxDeviceMapper; final String DEVICE_DEFAULT_CONFIG_SCREEN_AD = "{" + - "\"heartBeatIntervel\":300000," + //5MIN - "\"dataRefreshIntervel\":3600000," + //1HOUR + "\"heartbeatInterval\":300000," + //5MIN + "\"dataRefreshInterval\":3600000," + //1HOUR "\"pageChangeInterval\":10000," + //10SEC "\"animationTheme\":0" + "}"; @@ -64,8 +64,8 @@ public class WxDeviceServiceImpl implements WxDeviceService { } if (type == EnumDeviceType.SCREEN.getCode()) { - Integer heartBeatIntervel = jConfig.getInteger("heartBeatIntervel"); - Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshIntervel"); + Integer heartBeatIntervel = jConfig.getInteger("heartbeatInterval"); + Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshInterval"); Integer pageChangeInterval = jConfig.getInteger("pageChangeInterval"); Integer animationTheme = jConfig.getInteger("animationTheme"); if (heartBeatIntervel == null || From 650cc5d84824ee218aec27aef574354a9855c125 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 21 Mar 2019 14:16:44 +0800 Subject: [PATCH 10/20] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/schedule/BillNotificationSchedule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java index c40acc1a1..77359957e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java @@ -112,7 +112,7 @@ public class BillNotificationSchedule { WxMsgRecord wxMsgRecord = new WxMsgRecord(); wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); - wxMsgRecord.setModelType(EnumMsgModel.BILL_OWE.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode()); wxMsgRecord.setReceiver(phone); wxMsgRecord.setTenantId(tenantId); Map map = new HashedMap(); From 531d77ccb232883cd2fa8a775935107e0431a122 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 21 Mar 2019 15:38:01 +0800 Subject: [PATCH 11/20] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxCoupon.java | 6 +-- .../service/impl/WxChartServiceImpl.java | 38 +++++++++---------- .../main/resources/mapper/WxCouponMapper.xml | 4 +- 3 files changed, 24 insertions(+), 24 deletions(-) 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 2ed6b9bf5..e743c3197 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -166,7 +166,7 @@ public class WxCoupon implements Serializable { @Transient private String xtime; @Transient - private Long xcount; + private String xcount; /**售出卡数量**/ @io.swagger.annotations.ApiModelProperty(value="售出卡数量",name="saleCount") @Transient @@ -259,11 +259,11 @@ public class WxCoupon implements Serializable { this.pressJoinCount = pressJoinCount; } - public Long getXcount() { + public String getXcount() { return xcount; } - public void setXcount(Long xcount) { + public void setXcount(String xcount) { this.xcount = xcount; } 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 7e4fe044f..5806693a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1492,8 +1492,8 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashedMap(); List saleMoneyList = wxCouponService.findSaleMoneyByDate(wxCoupon); List paymentList = wxCouponService.findPaymentByDate(wxCoupon); - Map saleMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map payMentMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map saleMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map payMentMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); for (WxCoupon coupon:saleMoneyList){ saleMap.put(coupon.getXtime(),coupon.getXcount()); @@ -1538,10 +1538,10 @@ public class WxChartServiceImpl implements WxChartDataService { List priceCouponSaleCountList = wxCouponService.priceCouponSaleCount(wxCoupon); List priceCouponPaymentCountList = wxCouponService.priceCouponPaymentCount(wxCoupon); - Map orderCountMap = 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()); + Map orderCountMap = 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:orderCountList){ orderCountMap.put(coupon.getXtime(),coupon.getXcount()); @@ -1594,9 +1594,9 @@ public class WxChartServiceImpl implements WxChartDataService { List pressSuccHistory = wxCouponService.pressSuccHistory(wxCoupon); List pressPaymentHistory = wxCouponService.pressPaymentHistory(wxCoupon); - Map pressSendHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map pressSuccHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); - Map pressPaymentHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map pressSendHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map pressSuccHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); + Map pressPaymentHistoryMap = getDateMap(wxCoupon.getStartdate(),wxCoupon.getEnddate()); for (WxCoupon coupon:pressSendHistory){ pressSendHistoryMap.put(coupon.getXtime(),coupon.getXcount()); @@ -1646,8 +1646,8 @@ public class WxChartServiceImpl implements WxChartDataService { List> successlist = wxOrderGroupMapper.queryOrderGroupSuccessCountAndTime(params); List> verifyList = wxOrderGroupMapper.queryOrderGroupVerifyCountAndTime(params); - Map successMap = getDateMap(startTime, endTime); - Map verifyMap = getDateMap(startTime, endTime); + Map successMap = getDateMap(startTime, endTime); + Map verifyMap = getDateMap(startTime, endTime); long successCount = wxOrderGroupMapper.queryOrderGroupSuccessCount(params); long groupCount = wxOrderGroupMapper.queryOrderGroupCount(params); @@ -1658,16 +1658,16 @@ public class WxChartServiceImpl implements WxChartDataService { transferRatio = new BigDecimal(transfer).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); } - Map successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> { + Map successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> { return x.get("time").toString(); }, x -> { - return (long) x.get("total"); + return (String) x.get("total"); })); - Map verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> { + Map verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> { return x.get("time").toString(); }, x -> { - return (long) x.get("total"); + return (String) x.get("total"); })); successMap.putAll(successListMap); @@ -1768,10 +1768,10 @@ public class WxChartServiceImpl implements WxChartDataService { return vo; } - public static Map getDateMap(Date begin, Date end) { + public static Map getDateMap(Date begin, Date end) { SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - Map map = new LinkedHashMap<>(); - map.put(format.format(begin), 0L); + Map map = new LinkedHashMap<>(); + map.put(format.format(begin), "0"); Calendar calBegin = Calendar.getInstance(); calBegin.setTime(begin); Calendar calEnd = Calendar.getInstance(); @@ -1780,7 +1780,7 @@ public class WxChartServiceImpl implements WxChartDataService { end = calEnd.getTime(); while (calBegin.getTime().before(end)) { calBegin.add(Calendar.DAY_OF_MONTH, 1); - map.put(format.format(calBegin.getTime()), 0L); + map.put(format.format(calBegin.getTime()), "0"); } return map; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index cd82d5ae3..5a73c826e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -680,7 +680,7 @@ From 70afb204c23732280d977720edbeb48564931fdb Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 21 Mar 2019 16:22:52 +0800 Subject: [PATCH 13/20] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 78b6b70e3..9733ecd4e 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -688,7 +688,7 @@ From 4ba0fab4c78b2e9bb38758a6f560dd6d5752cef9 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 17:44:40 +0800 Subject: [PATCH 18/20] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=A7=E5=B1=8F=E8=AE=BE=E7=BD=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxDeviceServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java index efca8b262..901570ab9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java @@ -89,7 +89,7 @@ public class WxDeviceServiceImpl implements WxDeviceService { wxDeviceMapper.insertSelective(record); } else { record.setUpdateDate(new Date()); - if (record.getConfig() != null) { + if (record.getConfig() != null && record.getType() != null){ if (!checkConfig(record.getType(),record.getConfig())) { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } From 9798b80e2e14af38184dbcdb8c50b000489818c2 Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 21 Mar 2019 17:54:51 +0800 Subject: [PATCH 19/20] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCouponMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index ca9e23e6a..213554477 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -866,16 +866,17 @@ From adf77d4ac56c0fc7fed7ca1583672457ff5f130d Mon Sep 17 00:00:00 2001 From: luozukai Date: Thu, 21 Mar 2019 18:07:07 +0800 Subject: [PATCH 20/20] =?UTF-8?q?[=E8=90=A5=E9=94=80=E5=88=86=E6=9E=90][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0][=E5=8D=A1=E8=90=A5=E9=94=80=E5=88=97?= =?UTF-8?q?=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCouponController.java | 5 ++++- .../src/main/java/com/iformall/domain/po/WxCoupon.java | 3 +-- mallinkService/src/main/resources/mapper/WxCouponMapper.xml | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java index 46e5fe738..a611515d9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java @@ -172,8 +172,11 @@ public class WxCouponController extends BaseController { if(coupon.getSumSubsidy() == null){ coupon.setSumSubsidy(0); } + if(coupon.getSumSubsidy() == null){ + coupon.setSumSubsidy(0); + } } - return new ResultData(); + return new ResultData(pageInfo); } @ApiOperation("砍价营销列表接口") 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 e743c3197..70e791443 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -212,8 +212,7 @@ public class WxCoupon implements Serializable { //营销分析-----end----- - - public Integer getSumSubsidy() { + public Integer getSumSubsidy() { return sumSubsidy; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 213554477..65d04c66b 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -44,6 +44,7 @@ + @@ -754,7 +755,7 @@