liujunchi 3 лет назад
Родитель
Сommit
92e17b55d9

+ 3 - 3
cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -105,14 +105,14 @@
     <select id="getUserOrderInfoList" resultType="java.util.Map">
         select
             member_id as userId,
-            min(receive_time) as receiveTime
+            min(payment_time) as receiveTime
         from oms_order
         <where>
             <if test="startTime != null and startTime !=''">
-                and receive_time &gt;= #{startTime}
+                and payment_time &gt;= #{startTime}
             </if>
             <if test="endTime != null and endTime != ''">
-                and receive_time &lt;= #{endTime}
+                and payment_time &lt;= #{endTime}
             </if>
             <if test="userIdList != null and userIdList.size() != 0">
                 and member_id in

+ 3 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysMessageServiceImpl.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Random;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSON;
 import com.yonge.cooleshow.biz.dal.dto.JumpUrlDto;
@@ -211,7 +212,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			return;
 		}
 
-		String[] tos = receivers.values().toArray(new String[receivers.size()]);
+		String[] tos = new String[receivers.size()];
+		tos = receivers.entrySet().stream().map(longStringEntry -> String.valueOf(longStringEntry.getKey())).collect(Collectors.toList()).toArray(tos);
 		SysMessageConfig messageConfig = sysMessageConfigService.queryByType(type.getCode());
 		if (messageConfig == null) {
 			throw new BizException("消息类型错误");