diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java
index 4c5af1554..3df3ecb5e 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java
@@ -130,7 +130,9 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService {
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
Date today = calendar.getTime();//今天零点
- calendar.set(DAY_OF_MONTH,calendar.get(DAY_OF_MONTH) +1);
+ calendar.set(Calendar.HOUR_OF_DAY, 23);
+ calendar.set(Calendar.MINUTE, 59);
+ calendar.set(Calendar.SECOND, 59);
Date tomorrow =calendar.getTime();//明天零点
record.setStartDate(today);
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
index c8fd705a8..f6f9afee9 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
@@ -57,7 +57,12 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM
" ( '" + idWorker.nextId() + "', '" + tenantId + "', '13', '商户分账账户变更通知商户', '富茂', '您于{time}将{merchant}商户的收款账户变更为[{account}],后续销售分成及营销补贴将存入该账户', '" + nowTimestr + "', '1', '0', null, null)," +
" ( '" + idWorker.nextId() + "', '" + tenantId + "', '14', '商户分账账户不使用回执', '富茂', '商管已同意[{account}]作为{merchant}商户的收款账户。后续的销售分成及营销补贴将存入此账户', '" + nowTimestr + "', '1', '0', null, null)," +
" ( '" + idWorker.nextId() + "', '" + tenantId + "', '15', '商户分账账户使用回执', '富茂', '商管拒绝将[{account}]作为{merchant}商户的收款账户。如有疑问请联系商管', '" + nowTimestr + "', '1', '0', null, null)," +
- " ( '" + idWorker.nextId() + "', '" + tenantId + "', '16', '商户分账账户删除提醒', '富茂', '{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户', '" + nowTimestr + "', '1', '0', null, null);";
+ " ( '" + idWorker.nextId() + "', '" + tenantId + "', '16', '商户分账账户删除提醒', '富茂', '{merchant}商户的收款账户[{account}]于{time}取消绑定,营销活动与销售分成将无法正常进行,请尽快绑定新收款账户', '" + nowTimestr + "', '1', '0', null, null)," +
+ " ( '" + idWorker.nextId() + "', '" + tenantId + "', '17', '限时活动报名成功', '富茂', '亲爱的{person},您已成功报名{party},盼望您于{time}到场参加活动,谢谢。', '" + nowTimestr + "', '1', '0', null, 'SMS_194900027')," +
+ " ( '" + idWorker.nextId() + "', '" + tenantId + "', '18', '限时活动参加提醒', '富茂', '亲爱的{person},{party}活动将在{time}准时开始,感谢您能够抽出宝贵时间准时到活动现场参与,谢谢。', '" + nowTimestr + "', '1', '0', null, 'SMS_194920016')," +
+ " ( '" + idWorker.nextId() + "', '" + tenantId + "', '28', '会员生日券开启', '富茂', '亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,并在生日当天消费领取{creditScale}倍积分,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!', '" + nowTimestr + "', '1', '0', null, 'SMS_194915025')," +
+ " ( '" + idWorker.nextId() + "', '" + tenantId + "', '29', '会员生日券未开启', '富茂', '亲到的{userName},在您的生日到来之际,我们精心的为您准备了一份生日礼物,赶快打开{mallName}微信小程序领取您的专属生日礼物吧!', '" + nowTimestr + "', '1', '0', null, 'SMS_194900031')," +
+ " ( '" + idWorker.nextId() + "', '" + tenantId + "', '30', '系统发卡', '富茂', '亲爱的,您收到一张【{title}】,兑换码:{pw}。请于30天内打开微信小程序:{app}兑换!进店详询。', '" + nowTimestr + "', '1', '0', null, 'SMS_194920021');";
wxMsgValidationcodeModelMapper.wxMsgValidationcodeModelInit(initSql);
String initSql1 = "insert into `mallink`.`wx_msg_validationcode_model` ( `id`, `tenant_id`, `type`, `name`, `signature`, `content`, `createtime`, `status`, `minutes`, `model_id`, `email_bg_img`)" +
"values ( '" + idWorker.nextId() + "', '" + tenantId + "', '10', '审批通过通知', '富茂', " +
diff --git a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml
index 2a76f52a5..3835011a3 100644
--- a/mallinkService/src/main/resources/mapper/WxActivityMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxActivityMapper.xml
@@ -94,7 +94,8 @@
- and `activity_start_time` >= #{startDate} and `activity_end_time` < #{endDate}
+ and ((`activity_start_time` >= #{startDate} and `activity_start_time` <= #{endDate})
+ or (`activity_end_time` >= #{startDate} and `activity_end_time` <= #{endDate}))
diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml
index ddab1de7a..7849f3a16 100644
--- a/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCUserBasicSignMapper.xml
@@ -54,7 +54,7 @@
and `signin_date` >= #{startDate}
- and `signin_date` < #{endDate}
+ and `signin_date` <= #{endDate}