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

kmall-admin/src/main/java/com/kmall/admin/controller/StoreSmsConfigController.java

@@ -67,6 +67,10 @@ public class StoreSmsConfigController {
         if (entity!=null){
             return R.error("该门店已有配置，请在原基础上修改");
         }
+        if ("2".equals(storeSmsConfig.getIsEnable())){
+            storeSmsConfig.setSendEndTime(null);
+            storeSmsConfig.setSendStartTime(null);
+        }
         storeSmsConfig.setCreaterSn(ShiroUtils.getUserId().toString());
         storeSmsConfig.setCreateTime(new Date());
         storeSmsConfig.setModerSn(ShiroUtils.getUserId().toString());
@@ -84,6 +88,10 @@ public class StoreSmsConfigController {
     public R update(@RequestBody StoreSmsConfigEntity storeSmsConfig) {
         storeSmsConfig.setModerSn(ShiroUtils.getUserId().toString());
         storeSmsConfig.setModTime(new Date());
+        if ("2".equals(storeSmsConfig.getIsEnable())){
+            storeSmsConfig.setSendEndTime(null);
+            storeSmsConfig.setSendStartTime(null);
+        }
         storeSmsConfigService.update(storeSmsConfig);
 
         return R.ok();

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

@@ -143,8 +143,8 @@
 		<set>
 			<if test="storeId != null">`store_id` = #{storeId}, </if>
 			<if test="merchSn != null">`merch_sn` = #{merchSn}, </if>
-			<if test="sendStartTime != null">`send_start_time` = #{sendStartTime}, </if>
-			<if test="sendEndTime != null">`send_end_time` = #{sendEndTime}, </if>
+			`send_start_time` = #{sendStartTime},
+			`send_end_time` = #{sendEndTime},
 			<if test="isValid != null">`is_valid` = #{isValid}, </if>
 			<if test="isEnable != null">`is_enable` = #{isEnable}, </if>
 			<if test="createrSn != null">`creater_sn` = #{createrSn}, </if>

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

@@ -64,10 +64,10 @@
             </Form-item>
 
             <Form-item label="发送开始时间" prop="sendStartTime">
-                <i-input  type='date' :disabled='storeSmsConfig.isEnable==2' v-model="storeSmsConfig.sendStartTime" placeholder="发送开始时间" style="width:160px;"/>
+                <i-input  type='date' :disabled='storeSmsConfig.isEnable==2 || storeSmsConfig.isEnable==1' v-model="storeSmsConfig.sendStartTime" placeholder="发送开始时间" style="width:160px;"/>
             </Form-item>
             <Form-item label="发送结束时间" prop="sendEndTime">
-                <i-input  type='date' :disabled='storeSmsConfig.isEnable==2' v-model="storeSmsConfig.sendEndTime" placeholder="发送结束时间" style="width:160px;"/>
+                <i-input  type='date' :disabled='storeSmsConfig.isEnable==2 || storeSmsConfig.isEnable==1' v-model="storeSmsConfig.sendEndTime" placeholder="发送结束时间" style="width:160px;"/>
             </Form-item>
 <!--            <Form-item label="是否启用" prop="isValid">-->
 <!--                <i-input v-model="storeSmsConfig.isValid" placeholder="是否启用"/>-->