消息模版修复

src/main/java/com/usky/dxtop/service/api/WxApi.java

@@ -62,6 +62,9 @@ public class WxApi {
      * 消费模版id
      */
     public static final String DISH_TEMPLATE_ID = "l8PMggrTWBpQoXOGTWFkw2lRkos99Gav06l7Ts1A4nQ";
+
+
+    public static final String DRE_ORDER_INSERT = "44NSntZp6p31VO0s8muLDB5Ux7IXQgRDOpD2sf3Dy2g";
     /**
      * 公众号的key
      */

src/main/java/com/usky/dxtop/service/impl/DreOrderServiceImpl.java

@@ -195,8 +195,8 @@ public class DreOrderServiceImpl extends ServiceImpl<DreOrderMapper, DreOrder> i
         list = list.stream().filter(dreUserVO -> StringUtils.isNotBlank(dreUserVO.getOpenId())).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(list)){
             for (DreUserVO dreUserVO:list) {
-                String result = wxApi.sendMessageApi(dreUserVO.getOpenId(),getMessageData(dreOrder),wxApi.getToken(WxApi.APP_ID,WxApi.SECRET), WxApi.DISH_TEMPLATE_ID,url);
-                wxApi.againSendMessage(result,dreUserVO.getOpenId(), getMessageData(dreOrder), WxApi.DISH_TEMPLATE_ID, URL,WxApi.APP_ID,WxApi.SECRET);
+                String result = wxApi.sendMessageApi(dreUserVO.getOpenId(),getMessageData(dreOrder),wxApi.getToken(WxApi.APP_ID,WxApi.SECRET), WxApi.DRE_ORDER_INSERT,url);
+                wxApi.againSendMessage(result,dreUserVO.getOpenId(), getMessageData(dreOrder), WxApi.DRE_ORDER_INSERT, URL,WxApi.APP_ID,WxApi.SECRET);
             }
         }
     }
@@ -205,10 +205,11 @@ public class DreOrderServiceImpl extends ServiceImpl<DreOrderMapper, DreOrder> i
         Map<String, Object> map = new HashMap<>();
         map.put("first",getMap("您好，您有新订单",null));
         map.put("keyword1",getMap(dreOrder.getOrderNumber(),null));
-        map.put("keyword2",getMap(dreOrder.getOrderUserName(),null));
-        map.put("keyword3",getMap(DateUtils.format(dreOrder.getOrderTime(),null),null));
-        map.put("keyword4",getMap(dreOrder.getAddress(),null));
-        map.put("keyword5",getMap(dreOrder.getMType(),null));
+        map.put("keyword2",getMap(String.format("%s%s", Arith.div(dreOrder.getTotalMoney().doubleValue(),1,2)," 元"),null));
+        map.put("keyword3",getMap(DateUtils.format(new Date(),null),null));
+        map.put("keyword4",getMap(dreOrder.getOrderUserName(),null));
+        map.put("keyword5",getMap(dreOrder.getAddress(),null));
+        map.put("remark",getMap(dreOrder.getRemark(),null));
         return map;
     }
 

src/main/java/com/usky/dxtop/service/impl/DreUserServiceImpl.java

@@ -59,6 +59,6 @@ public class DreUserServiceImpl extends ServiceImpl<DreUserMapper, DreUser> impl
 
     @Override
     public List<DreUserVO> list(String name, Boolean isSend) {
-        return null;
+        return baseMapper.list(name,isSend);
     }
 }

src/main/resources/mapper/DreUserMapper.xml

@@ -8,8 +8,8 @@
         <result column="user_id" property="userId" />
         <result column="is_send" property="isSend" />
     </resultMap>
-    <select id="page" resultType="com.usky.dxtop.model.DreUser">
-        select s.*,d.name as deptName,tr.identity,tr.proportion,tr.id as radioId
+    <select id="page" resultType="com.usky.dxtop.service.vo.DreUserVO">
+        select s.*,du.is_send as isSend
         from staff as s
         inner join dre_user as du
          on s.s_id = du.user_id
@@ -24,7 +24,7 @@
         order by s.id desc
     </select>
     <select id="list" resultType="com.usky.dxtop.service.vo.DreUserVO">
-        select s.*,d.name as deptName,tr.identity,tr.proportion,tr.id as radioId
+        select s.*,du.is_send as isSend
         from staff as s
         inner join dre_user as du
         on s.s_id = du.user_id