Browse Source

Merge branch 'test02' into dev02

# Conflicts:
#	src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
#	src/main/resources/props/config_local.properties
#	src/main/resources/props/config_test.properties
anderx 3 years ago
parent
commit
c24cb9ddd2

+ 10 - 4
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1049,8 +1049,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="amountStatus == 4">
   	and a.total_amount  &gt; 40
   	</if>
-  	<if test="depId != null">
-  	and a.order_dep = #{depId,jdbcType=VARCHAR}
+  	<if test="deps != null">
+      and a.order_dep in
+      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
+        #{deps.id}
+      </foreach>
   	</if>
     <if test="starTime !=null and endTime !=null">
       and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
@@ -1198,8 +1201,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   	<if test="amountStatus == 4">
   	and a.total_amount  &gt; 40
   	</if>
-  	<if test="depId != null">
-  	and a.order_dep = #{depId,jdbcType=VARCHAR}
+  	<if test="deps != null">
+      and a.order_dep in
+      <foreach close=")" collection="deps" item="deps" open="(" separator=",">
+        #{deps.id}
+      </foreach>
   	</if>
   	<if test="starTime !=null and endTime !=null">
   	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}

+ 8 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -6,7 +6,14 @@ import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 
 import javax.mail.MessagingException;

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -46,7 +46,7 @@ user_remind_days=15
 user_channel_days=90
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.35
+static.host=//static.jishutao.com/1.2.36
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.27
 #static.host=http://172.16.1.187/prod/1.2.25

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -43,7 +43,7 @@ user_remind_days=15
 #\u63D0\u524D\u63D0\u9192\u5929\u6570
 user_channel_days=90
 
-static.host=//static.jishutao.com/1.2.35
+static.host=//static.jishutao.com/1.2.36
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload