Просмотр исходного кода

xingxingdiandeng

release_toaliyun_real
xhxu 5 лет назад
Родитель
Сommit
3a6f54dbc3
6 измененных файлов: 24 добавлений и 13 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java
  5. +9
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java
  6. +8
    -0
      mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java Просмотреть файл

@@ -71,7 +71,7 @@ public class WxMsgController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxMsgController::list");
if (null == wxTemplateMsg) wxTemplateMsg = new WxTemplateMsg();
wxTemplateMsg.updateTenantInfo(getTenantInfo());
final PageInfo<WxTemplateMsg> page = wxTemplateMsgService.listAsPage(wxTemplateMsg, pageNum, pageSize);
final PageInfo<WxTemplateMsg> page = wxTemplateMsgService.listAsPageForMiniApp(wxTemplateMsg, pageNum, pageSize);
return new ResultData(page);
}



+ 3
- 3
mallinkService/src/main/java/com/iformall/enums/EnumTemplateType.java Просмотреть файл

@@ -7,9 +7,9 @@ public enum EnumTemplateType {

// 1-核销成功消息, 2-核销失败消息

VERIFY_SUCCESS(1, "核销成功消息",""), // 小程序
VERIFY_FAIL(2, "核销失败消息",""), // 小程序
PRESS_SUCCESS(3, "砍价成功消息",""), // 小程序
VERIFY_SUCCESS(1, "核销成功消息",""), // 小程序(作废)
VERIFY_FAIL(2, "核销失败消息",""), // 小程序(作废)
PRESS_SUCCESS(3, "砍价成功消息",""), // 小程序(作废)

ACTIVITY_REMIND(4, "活动开始提醒","386"), // 小程序
LIVE_REMIND(5, "直播开播提醒","8501"), // 小程序


+ 1
- 0
mallinkService/src/main/java/com/iformall/mapper/WxTemplateMsgMapper.java Просмотреть файл

@@ -8,4 +8,5 @@ public interface WxTemplateMsgMapper extends CommonMapper<WxTemplateMsg, Long> {

List<WxTemplateMsg> findList(WxTemplateMsg wxTemplateMsg);

List<WxTemplateMsg> findListForMiniApp(WxTemplateMsg record);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxTemplateMsgService.java Просмотреть файл

@@ -60,4 +60,6 @@ public interface WxTemplateMsgService {


ResultData pushTemp(WxTemplateMsg wxTemplateMsg);

PageInfo<WxTemplateMsg> listAsPageForMiniApp(WxTemplateMsg wxTemplateMsg, Integer pageNum, Integer pageSize);
}

+ 9
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxTemplateMsgServiceImpl.java Просмотреть файл

@@ -48,19 +48,14 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService {
WxTemplateMsg wxTemplateMsg = new WxTemplateMsg();
wxTemplateMsg.setTenantId(tenantId);
wxTemplateMsg.setTemplateId("");
wxTemplateMsg.setType(1);
wxTemplateMsg.setCustomParam("{\"index\":[\"keyword1\",\"keyword2\",\"keyword3\",\"keyword4\",\"keyword5\",\"keyword6\",\"keyword7\"]," +
"\"keyword1\":\"可抵{keyword1}元\",\"keyword2\":\"{keyword2}\",\"keyword3\":\"{keyword3}\",\"keyword4\":\"{keyword4}\"," +
"\"keyword5\":\"{keyword5}元\",\"keyword6\":\"{keyword6}\",\"keyword7\":\"猜也猜不到的优惠,只有幸运的人才能看到,就是你," +
"{keyword7}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n\",\"emphasis\":\"keyword1.DATA\"}");
wxTemplateMsg.setType(EnumTemplateType.ACTIVITY_REMIND.getCode());
wxTemplateMsg.setCustomParam("{\"index\": [\"thing13\", \"date5\", \"thing12\", \"thing1\", \"thing11\"], \"emphasis\": \"\"}");
wxTemplateMsg.setCreateDate(new Date());
wxTemplateMsg.setUpdateDate(new Date());
wxTemplateMsgMapper.insert(wxTemplateMsg);
wxTemplateMsg.setId(null);
wxTemplateMsg.setType(2);
wxTemplateMsg.setCustomParam("{\"index\":[\"keyword1\",\"keyword2\",\"keyword3\",\"keyword4\"],\"keyword1\":\"可抵{keyword1}元\"," +
"\"keyword2\":\"{keyword2}\",\"keyword3\":\"{keyword3}\",\"keyword4\":\"猜也猜不到的优惠,只有幸运的人才能看到,就是你," +
"{keyword4}\\n☟☟☟☟☟☟☟\\n☞ 快看看 ☜\\n☝︎☝︎☝︎☝︎☝︎☝︎☝︎\\n\",\"emphasis\":\"keyword1.DATA\"}");
wxTemplateMsg.setType(EnumTemplateType.LIVE_REMIND.getCode());
wxTemplateMsg.setCustomParam("{\"index\": [\"thing1\", \"date3\", \"thing4\", \"thing5\"], \"emphasis\": \"\"}");
wxTemplateMsgMapper.insert(wxTemplateMsg);
}

@@ -146,5 +141,10 @@ public class WxTemplateMsgServiceImpl implements WxTemplateMsgService {
return new ResultData();
}

@Override
public PageInfo<WxTemplateMsg> listAsPageForMiniApp(WxTemplateMsg record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxTemplateMsgMapper.findListForMiniApp(record));
}


}

+ 8
- 0
mallinkService/src/main/resources/mapper/WxTemplateMsgMapper.xml Просмотреть файл

@@ -64,5 +64,13 @@
<include refid="dynamicWhereConditions"/>
</select>

<select id="findListForMiniApp" parameterType="com.iformall.domain.po.WxTemplateMsg" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from wx_template_msg
<include refid="dynamicWhereConditions"/>
and `type` &gt; 3 and `type` &lt; 100
</select>


</mapper>

Загрузка…
Отмена
Сохранить