fix 渠道推广链接sql去掉distinct

netflix-dao/src/main/java/com/cyksj/model/views/ChannelPopularizeDetailView.java

@@ -1,14 +1,11 @@
 package com.cyksj.model.views;
 
 import com.ejlchina.searcher.bean.DbField;
-import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
 
 /**
  * @author chan
@@ -21,7 +18,6 @@ import java.util.List;
         " left join order_don o1 on o1.`status` != 'close' and o.id = o1.id " +
         " left join order_don o2 on o2.`status` = 'refund' and o.id = o2.id "
         ,where = ":time: "
-        ,distinct = true
         ,groupBy = "o.goods_id,o.popularize_id"
 )
 public class ChannelPopularizeDetailView {
@@ -34,6 +30,9 @@ public class ChannelPopularizeDetailView {
     @DbField("g.title")
     private String goodsName;
 
+    @DbField("g.id")
+    private Long goodsId;
+
     /**
      * 订单数
      */

netflix-dao/src/main/java/com/cyksj/model/views/ChannelPopularizeView.java

@@ -20,7 +20,6 @@ import java.util.Date;
         " LEFT JOIN order_don o1 on o.id = o1.id and o1.`status` not in ('close','noPayment') " +
         " LEFT JOIN order_don o2 on o.id = o2.id and o2.`status` = 'refund' " +
         " LEFT JOIN channel c on c.id = cp.channel_id "
-        ,distinct = true
         ,groupBy = "cp.id,cp.name,cp.url,cp.modality,cp.pay_method,cp.created_time,cp.update_time"
 )
 public class ChannelPopularizeView {

netflix-web/src/main/java/com/cyksj/web/controller/manage/channel/CmsChannelPopularizeController.java

@@ -80,15 +80,16 @@ public class CmsChannelPopularizeController {
     public Result<List<ChannelPopularizeDetailView>> getById(@PathVariable Long id, String startTime, String endTime){
         String timeSql = StringUtils.EMPTY;
         if(StringUtils.isNotBlank(startTime)){
-            timeSql += " and o.created_time >= " + startTime;
+            timeSql += " o.created_time >= '" + startTime + "'";
         }
         if(StringUtils.isNotBlank(endTime)){
-            timeSql += " and o.created_time <= " + endTime;
+            timeSql += " and o.created_time <= '" + endTime + "'";
         }
         List<ChannelPopularizeDetailView> result = beanSearcher.searchAll(ChannelPopularizeDetailView.class,
                 MapUtils.flatBuilder(request.getParameterMap())
-                        .field(ChannelPopularizeDetailView::getPopularizeId,id)
-                        .field("time",timeSql)
+                        .field(ChannelPopularizeDetailView::getPopularizeId, id)
+                        .put("time", timeSql)
+                        .orderBy(ChannelPopularizeDetailView::getGoodsId).asc()
                         .build());
         return GatewayResponse.SUCCESS.newBuilder().toResult(result);
     }