zoujiajian 2 rokov pred
rodič
commit
d72e6b9c46

+ 5 - 6
netflix-dao/src/main/resources/mapper/OrderDonMapper.xml

@@ -425,16 +425,15 @@
 
     <select id="selectMaxRefundGoodsName" resultType="java.lang.String">
         select (select title from goods_don where id = o.goods_id limit 1)
-        from refund_order_don rd inner join order_don o
+        from (select distinct order_id from refund_order_don where operator = #{operator}
+        and refund_method not in ('EX_CODE'
+        , 'balance')) rd inner join order_don o
         on o.id = rd.order_id
-        where rd.operator = #{operator}
-        and rd.refund_method not in ('EX_CODE'
-        , 'balance')
         <if test="startTime != null">
-            and rd.created_time >= #{startTime}
+            and o.created_time >= #{startTime}
         </if>
         <if test="endTime != null">
-            and rd.created_time &lt; #{endTime}
+            and o.created_time &lt; #{endTime}
         </if>
         group by o.goods_id
         order by count(*) desc limit 1

+ 2 - 2
netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -751,10 +751,10 @@ public class CmsOrderController {
 	public Result<SearchResult<RefundOrderDonServiceDataView>> getRefundOrderData(String startTime, String endTime, String operator) {
 		String time = StrUtil.EMPTY;
 		if (StrUtil.isNotBlank(startTime)) {
-			time += String.format(" and rd.created_time >= '%s'", startTime);
+			time += String.format(" and o.created_time >= '%s'", startTime);
 		}
 		if (StrUtil.isNotBlank(endTime)) {
-			time += String.format(" and rd.created_time < '%s'", endTime);
+			time += String.format(" and o.created_time < '%s'", endTime);
 		}
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (StrUtil.isNotBlank(time)) {