模板消息

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -429,4 +429,22 @@ public class CommConstant {
 	public static final Object GROUP_ACTIVITY = "groupActivity";
 	public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    
+    /**
+     * 消息通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+	public static final String MINIAPP_TPL_NOTICE = "notice";
+    
+    /**
+     * 助力通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_HELP = "help.result";
+    
+    /**
+     * 拼团通知
+     * 必须存在表   td_miniapp_template_type 中
+     */
+    public static final String MINIAPP_TPL_GROUP = "group.result";
 }

src/main/java/com/huiju/estateagents/controller/TaPosterController.java

@@ -7,6 +7,8 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPoster;
+import com.huiju.estateagents.entity.TaPosterUsed;
+import com.huiju.estateagents.service.ITaPosterUsedService;
 import com.huiju.estateagents.service.TaPosterService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,6 +23,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -39,6 +43,8 @@ public class TaPosterController extends BaseController {
     @Autowired
     public TaPosterService iPosterService;
 
+    @Autowired
+    private ITaPosterUsedService taPosterUsedService;
 
     /**
      * 分页查询列表
@@ -81,6 +87,19 @@ public class TaPosterController extends BaseController {
             poster.setOrgId(getOrgId(request));
             poster.setCreateDate(LocalDateTime.now());
             if (iPosterService.save(poster)) {
+                //添加模板和海报映射关系
+                if (poster.getTemplateIds().size() > 0){
+                    List<TaPosterUsed> taPosterUsedList = new ArrayList<>();
+                    poster.getTemplateIds().forEach(e -> {
+                        TaPosterUsed taPosterUsed = new TaPosterUsed();
+                        taPosterUsed.setCreateDate(LocalDateTime.now());
+                        taPosterUsed.setOrgId(getOrgId(request));
+                        taPosterUsed.setPosterId(poster.getPosterId());
+                        taPosterUsed.setTemplateId(e);
+                        taPosterUsedList.add(taPosterUsed);
+                    });
+                    taPosterUsedService.saveBatch(taPosterUsedList);
+                }
                 responseBean.addSuccess(poster);
             } else {
                 responseBean.addError("fail");
@@ -125,11 +144,30 @@ public class TaPosterController extends BaseController {
      */
     @RequestMapping(value = "/admin/poster/{id}", method = RequestMethod.PUT)
     public ResponseBean posterUpdate(@PathVariable Integer id,
-                                     @RequestBody TaPoster poster) {
+                                     @RequestBody TaPoster poster, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         poster.setPosterId(id);
         try {
             if (iPosterService.updateById(poster)) {
+                //修改模板和海报映射关系
+                if (poster.getTemplateIds().size() > 0){
+                    //先删除映射关系
+                    QueryWrapper<TaPosterUsed> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("poster_id",poster.getPosterId());
+                    taPosterUsedService.remove(queryWrapper);
+                    
+                    //在添加映射关系
+                    List<TaPosterUsed> taPosterUsedList = new ArrayList<>();
+                    poster.getTemplateIds().forEach(e -> {
+                        TaPosterUsed taPosterUsed = new TaPosterUsed();
+                        taPosterUsed.setCreateDate(LocalDateTime.now());
+                        taPosterUsed.setOrgId(getOrgId(request));
+                        taPosterUsed.setPosterId(poster.getPosterId());
+                        taPosterUsed.setTemplateId(e);
+                        taPosterUsedList.add(taPosterUsed);
+                    });
+                    taPosterUsedService.saveBatch(taPosterUsedList);
+                }
                 responseBean.addSuccess(poster);
             } else {
                 responseBean.addError("fail");

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -82,7 +82,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
         data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
 
-        sendMessage("notice", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
     }
     
     @Override
@@ -92,7 +92,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
         data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
         
-        sendMessage("help.result", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
     }
     
     @Override
@@ -102,7 +102,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
         data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
         
-        sendMessage("group.result", toUser, link, data);
+        sendMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
     }
 
     @Override