| @@ -24,8 +24,6 @@ import org.springframework.web.bind.annotation.*; | |||||
| import java.util.List; | import java.util.List; | ||||
| import static com.iformall.domain.po.WxCampaign.Field.SortNum_ASC; | |||||
| @RestController | @RestController | ||||
| @RequestMapping("wxCampaign") | @RequestMapping("wxCampaign") | ||||
| @Api(description = "促销和banner接口") | @Api(description = "促销和banner接口") | ||||
| @@ -52,7 +50,7 @@ public class WxCampaignController extends BaseController { | |||||
| wxCampaign.setStatus(null); | wxCampaign.setStatus(null); | ||||
| } | } | ||||
| wxCampaign.setTenantId(getTenantId()); | wxCampaign.setTenantId(getTenantId()); | ||||
| wxCampaign.setSortColumns(SortNum_ASC); | |||||
| wxCampaign.setSortColumns(WxCampaign.Field.Id_DESC); | |||||
| final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); | final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -97,6 +97,7 @@ | |||||
| and createtime <= #{endTime} | and createtime <= #{endTime} | ||||
| </if> | </if> | ||||
| group by xTime | group by xTime | ||||
| order by xTime desc | |||||
| </select> | </select> | ||||
| <select id="sceneDataJoinCouponOrderList" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap"> | <select id="sceneDataJoinCouponOrderList" resultType="com.iformall.domain.vo.MarkingSceneDataReportVo" parameterType="hashmap"> | ||||
| @@ -103,7 +103,7 @@ | |||||
| <select id="touchUsersReportList" resultType="com.iformall.domain.vo.TouchUsersReportVo" parameterType="hashmap"> | <select id="touchUsersReportList" resultType="com.iformall.domain.vo.TouchUsersReportVo" parameterType="hashmap"> | ||||
| SELECT DATE_FORMAT(day_date,'%Y-%m-%d') as xTime,visit_pv as pv,visit_uv as uv | 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 | |||||
| </select> | </select> | ||||
| </mapper> | </mapper> | ||||