Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/entity/StoreSmsConfigEntity.java

@@ -59,6 +59,16 @@ public class StoreSmsConfigEntity implements Serializable {
      */
     private Date tstm;
 
+    private String isEnable;
+
+    public String getIsEnable() {
+        return isEnable;
+    }
+
+    public void setIsEnable(String isEnable) {
+        this.isEnable = isEnable;
+    }
+
     /**
      * 设置：主键
      */

kmall-admin/src/main/java/com/kmall/admin/service/impl/OrderProcessRecordServiceImpl.java

@@ -15,10 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -95,6 +92,7 @@ public class OrderProcessRecordServiceImpl implements OrderProcessRecordService
 
             // ========== 排除不是该门店短信配置 时间段内的订单===========
             List<StoreSmsConfigEntity> storeSmsConfigEntities = storeSmsConfigDao.queryListByIsValid();
+            List<StoreSmsConfigEntity> tempSmsList = storeSmsConfigDao.queryList(new HashMap<>());
             if (storeSmsConfigEntities!=null && storeSmsConfigEntities.size()>0){
                 Iterator<OrderProcessRecordEntity> iterator = recordList.iterator();
                 while (iterator.hasNext()) {
@@ -116,6 +114,10 @@ public class OrderProcessRecordServiceImpl implements OrderProcessRecordService
                 }
             }
 
+            // 如果压根没配配置表，就说明全都要发，如果有配，但没生效的话就全都不发
+            if (tempSmsList==null || tempSmsList.size()==0){
+                recordList = new ArrayList<>();
+            }
 
 
 
@@ -136,6 +138,7 @@ public class OrderProcessRecordServiceImpl implements OrderProcessRecordService
                                 + orderSn +"，取货码"+pickUpCodeEntity.getPickUpCodeSn()+"，已清关成功，感谢您的耐心等待。";
 
                         SendMsgUtil.sendMsg(orderProcessRecordEntity.getPayMobile(), sendTemplate);
+                        System.out.println(sendTemplate);
                         orderProcessRecordEntity.setCustomsSendSmsStatus("1");//如果发送失败更新表
                         orderProcessRecordDao.update(orderProcessRecordEntity);
                     }catch (Exception e){

kmall-admin/src/main/resources/mybatis/mapper/StoreSmsConfigDao.xml

@@ -10,6 +10,7 @@
         <result property="sendStartTime" column="send_start_time"/>
         <result property="sendEndTime" column="send_end_time"/>
         <result property="isValid" column="is_valid"/>
+		<result property="isEnable" column="is_enable"/>
         <result property="createrSn" column="creater_sn"/>
         <result property="createTime" column="create_time"/>
         <result property="moderSn" column="moder_sn"/>
@@ -25,6 +26,7 @@
 			`send_start_time`,
 			`send_end_time`,
 			`is_valid`,
+			`is_enable`,
 			`creater_sn`,
 			`create_time`,
 			`moder_sn`,
@@ -42,6 +44,7 @@
     		`send_start_time`,
     		`send_end_time`,
     		`is_valid`,
+		`is_enable`,
     		`creater_sn`,
     		`create_time`,
     		`moder_sn`,
@@ -80,13 +83,14 @@
 		`send_start_time`,
 		`send_end_time`,
 		`is_valid`,
+		`is_enable`,
 		`creater_sn`,
 		`create_time`,
 		`moder_sn`,
 		`mod_time`,
 		`tstm`
 		from mall_store_sms_config
-		WHERE is_valid='0'
+		WHERE is_valid='0' and is_enable='0'
 		and now() BETWEEN send_start_time and send_end_time
 	</select>
 	<select id="queryObjectByMerchSnAndStoreId" resultType="com.kmall.admin.entity.StoreSmsConfigEntity">
@@ -97,6 +101,7 @@
 		`send_start_time`,
 		`send_end_time`,
 		`is_valid`,
+		`is_enable`,
 		`creater_sn`,
 		`create_time`,
 		`moder_sn`,
@@ -113,6 +118,7 @@
 			`send_start_time`,
 			`send_end_time`,
 			`is_valid`,
+			`is_enable`,
 			`creater_sn`,
 			`create_time`,
 			`moder_sn`,
@@ -124,6 +130,7 @@
 			#{sendStartTime},
 			#{sendEndTime},
 			#{isValid},
+			#{isEnable},
 			#{createrSn},
 			#{createTime},
 			#{moderSn},
@@ -139,6 +146,7 @@
 			<if test="sendStartTime != null">`send_start_time` = #{sendStartTime}, </if>
 			<if test="sendEndTime != null">`send_end_time` = #{sendEndTime}, </if>
 			<if test="isValid != null">`is_valid` = #{isValid}, </if>
+			<if test="isEnable != null">`is_enable` = #{isEnable}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>
 			<if test="createTime != null">`create_time` = #{createTime}, </if>
 			<if test="moderSn != null">`moder_sn` = #{moderSn}, </if>

kmall-admin/src/main/webapp/WEB-INF/page/shop/storesmsconfig.html

@@ -49,9 +49,19 @@
 <!--                <i-input v-model="storeSmsConfig.isValid" placeholder="是否启用"/>-->
 <!--            </Form-item>-->
 
-            <Form-item label="是否启用" prop="isValid">
+            <Form-item label="是否有效" prop="isValid">
                 <Radio-group v-model="storeSmsConfig.isValid">
                     <Radio label="0">
+                        <span>有效</span>
+                    </Radio>
+                    <Radio label="1">
+                        <span>无效</span>
+                    </Radio>
+                </Radio-group>
+            </Form-item>
+            <Form-item label="是否启用" prop="isEnable">
+                <Radio-group v-model="storeSmsConfig.isEnable">
+                    <Radio label="0">
                         <span>启用</span>
                     </Radio>
                     <Radio label="1">

kmall-admin/src/main/webapp/js/shop/storesmsconfig.js

@@ -12,7 +12,12 @@ $(function () {
 			{label: '发送结束时间', name: 'sendEndTime', index: 'send_end_time', align: 'center', width: 80,formatter: function (value) {
 					return transDate(value,'yyyy-MM-dd hh:mm:ss');
 				}},
-			{label: '是否启用', name: 'isValid', index: 'is_valid', width: 80, align: 'center', formatter: function (value) {
+			{label: '是否有效', name: 'isValid', index: 'is_valid', width: 80, align: 'center', formatter: function (value) {
+					return value == 0 ?
+						'<span class="label label-success">是</span>' :
+						'<span class="label label-danger">否</span>';
+				}},
+			{label: '是否启用', name: 'isEnable', index: 'is_enable', width: 80, align: 'center', formatter: function (value) {
 					return value == 0 ?
 						'<span class="label label-success">是</span>' :
 						'<span class="label label-danger">否</span>';
@@ -65,6 +70,9 @@ let vm = new Vue({
 				{required: true, message: '发送结束时间不能为空', trigger: 'blur'}
 			],
 			isValid: [
+				{required: true, message: '是否有效不能为空', trigger: 'blur'}
+			],
+			isEnable: [
 				{required: true, message: '是否启用不能为空', trigger: 'blur'}
 			]
 		},