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

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

@@ -114,8 +114,8 @@ public class OrderProcessRecordServiceImpl implements OrderProcessRecordService
                 }
             }
 
-            // 如果压根没配配置表，就说明全都要发，如果有配，但没生效的话就全都不发
-            if (tempSmsList!=null && tempSmsList.size()>0){
+            // 如果压根没配配置表，就说明全都不要发
+            if (tempSmsList==null || tempSmsList.size()==0 || storeSmsConfigEntities==null || storeSmsConfigEntities.size()==0){
                 recordList = new ArrayList<>();
             }
 
@@ -138,7 +138,9 @@ public class OrderProcessRecordServiceImpl implements OrderProcessRecordService
                                 + orderSn +"，取货码"+pickUpCodeEntity.getPickUpCodeSn()+"，已清关成功，感谢您的耐心等待。";
 
                         SendMsgUtil.sendMsg(orderProcessRecordEntity.getPayMobile(), sendTemplate);
-                        System.out.println(sendTemplate);
+//                        System.out.println("=====================================");
+//                        System.out.println(sendTemplate);
+//                        System.out.println("=====================================");
                         orderProcessRecordEntity.setCustomsSendSmsStatus("1");//如果发送失败更新表
                         orderProcessRecordDao.update(orderProcessRecordEntity);
                     }catch (Exception e){

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

@@ -91,7 +91,7 @@
 		`tstm`
 		from mall_store_sms_config
 		WHERE is_valid='0' and is_enable='0'
-		and now() BETWEEN send_start_time and send_end_time
+		and now() BETWEEN send_start_time and send_end_time or is_enable='2'
 	</select>
 	<select id="queryObjectByMerchSnAndStoreId" resultType="com.kmall.admin.entity.StoreSmsConfigEntity">
 		select

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

@@ -59,14 +59,17 @@
                     </Radio>
                 </Radio-group>
             </Form-item>
-            <Form-item label="是否启用" prop="isEnable">
+            <Form-item label="启用状态" prop="isEnable">
                 <Radio-group v-model="storeSmsConfig.isEnable">
                     <Radio label="0">
-                        <span>启用</span>
+                        <span>时间状态发送</span>
                     </Radio>
                     <Radio label="1">
                         <span>禁用</span>
                     </Radio>
+                    <Radio label="2">
+                        <span>全部发送</span>
+                    </Radio>
                 </Radio-group>
             </Form-item>
             <Form-item>

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

@@ -17,10 +17,14 @@ $(function () {
 						'<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>';
+			{label: '启用状态', name: 'isEnable', index: 'is_enable', width: 80, align: 'center', formatter: function (value) {
+				if (value == 0){
+					return '<span class="label label-success">时间状态发送</span>';
+				}else if(value == 1){
+					return '<span class="label label-danger">禁用</span>';
+				}else{
+					return '<span class="label label-success">全部发送</span>';
+				}
 				}}],
 		viewrecords: true,
         height: 550,
@@ -73,7 +77,7 @@ let vm = new Vue({
 				{required: true, message: '是否有效不能为空', trigger: 'blur'}
 			],
 			isEnable: [
-				{required: true, message: '是否启用不能为空', trigger: 'blur'}
+				{required: true, message: '启用状态不能为空', trigger: 'blur'}
 			]
 		},
 		q: {