From b6e4580ae1363263fb6e14a8dd50f6dbb760c0b6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 26 Sep 2018 12:42:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=90=A5=E9=94=80=E7=B3=BB=E7=BB=9F][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=95=B0=E6=8D=AE=E5=80=92=E5=BA=8F?= =?UTF-8?q?=E6=8E=92=E5=88=97]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxCampaignController.java | 4 +--- .../src/main/resources/mapper/WxCouponActionLogMapper.xml | 1 + .../src/main/resources/mapper/WxUserVisitMapper.xml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java index 8bbc3f5b9..040d43ca8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java @@ -24,8 +24,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import static com.iformall.domain.po.WxCampaign.Field.SortNum_ASC; - @RestController @RequestMapping("wxCampaign") @Api(description = "促销和banner接口") @@ -52,7 +50,7 @@ public class WxCampaignController extends BaseController { wxCampaign.setStatus(null); } wxCampaign.setTenantId(getTenantId()); - wxCampaign.setSortColumns(SortNum_ASC); + wxCampaign.setSortColumns(WxCampaign.Field.Id_DESC); final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index ee2740657..64f7235cc 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -97,6 +97,7 @@ and createtime <= #{endTime} group by xTime + order by xTime desc SELECT DATE_FORMAT(day_date,'%Y-%m-%d') as xTime,visit_pv as pv,visit_uv as uv - from wx_user_visit where tenant_id=#{tenantId} AND day_date >= #{startTime} and day_date <= #{endTime} order by day_date ASC + from wx_user_visit where tenant_id=#{tenantId} AND day_date >= #{startTime} and day_date <= #{endTime} order by day_date desc