李天标 há 2 anos atrás
pai
commit
e9b4cb675c

+ 0 - 4
src/main/java/com/szwl/controller/ScheduledService.java

@@ -23,8 +23,4 @@ public class ScheduledService {
     public void getAccessToken() throws ParseException {
         szsmWxService.getAccessToken();
     }
-
-
-
-
 }

+ 18 - 3
src/main/java/com/szwl/controller/TEquipmentController.java

@@ -50,9 +50,24 @@ public class TEquipmentController {
 //        kindData.put("contactPhone", equipment.getContactPhone());
         Map<String,String> map = new HashMap<>();
         map.put("status", equipment.getEqeStatus().toString());
-        map.put("contactName", equipment.getContactName());
-        map.put("contactPhone", equipment.getContactPhone());
-        map.put("name", equipment.getName());
+        if(StringUtils.isEmpty(equipment.getContactName())){
+            map.put("contactName", "无");
+        }else {
+            map.put("contactName", equipment.getContactName());
+        }
+
+        if(StringUtils.isEmpty(equipment.getContactPhone())){
+            map.put("contactPhone", "无");
+        }else {
+            map.put("contactPhone", equipment.getContactPhone());
+        }
+
+        if(StringUtils.isEmpty(equipment.getName())){
+            map.put("name", "棉花糖");
+        }else {
+            map.put("name", equipment.getName());
+        }
+
         return R.ok(map);
     }
 

+ 13 - 0
src/main/java/com/szwl/controller/TSzsmWxController.java

@@ -261,5 +261,18 @@ public class TSzsmWxController {
         TSzsmWx szsmWx = szsmWxService.getById(id);
         return R.ok(szsmWx);
     }
+
+    /**
+     * 设置订阅取餐提醒
+     * @param
+     * @return
+     */
+    @GetMapping("/setDingYue")
+    public ResponseModel<?> setDingYue(String id) {
+        TSzsmWx szsmWx = szsmWxService.getById(id);
+        szsmWx.setIfSubscribe("1");
+        szsmWxService.updateById(szsmWx);
+        return R.ok();
+    }
 }
 

+ 2 - 1
src/main/java/com/szwl/mapper/xml/TSzsmWxMapper.xml

@@ -12,11 +12,12 @@
         <result column="nick_name" property="nickName" />
         <result column="avatar_url" property="avatarUrl" />
         <result column="integral" property="integral" />
+        <result column="if_subscribe" property="ifSubscribe" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, open_id, create_date, modify_date, phone, nick_name, avatar_url,integral
+        id, open_id, create_date, modify_date, phone, nick_name, avatar_url,integral,if_subscribe
     </sql>
 
 </mapper>

+ 2 - 1
src/main/java/com/szwl/model/entity/TSzsmWx.java

@@ -43,5 +43,6 @@ public class TSzsmWx implements Serializable {
 
     private BigDecimal integral;
 
-
+    //是否订阅取餐通知,0或者null:没有订阅;1:已订阅
+    private String ifSubscribe;
 }

+ 1 - 1
src/main/java/com/szwl/service/TSzsmWxService.java

@@ -14,5 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface TSzsmWxService extends IService<TSzsmWx> {
 
     void getAccessToken();
-
+    public String subscribeMessage(Long id,String code,String clientId);
 }

+ 47 - 0
src/main/java/com/szwl/service/impl/TSzsmWxServiceImpl.java

@@ -6,11 +6,15 @@ import com.szwl.model.bo.R;
 import com.szwl.model.entity.TSzsmWx;
 import com.szwl.mapper.TSzsmWxMapper;
 import com.szwl.model.utils.HttpClientSslUtils;
+import com.szwl.model.utils.JsonUtil;
 import com.szwl.service.TSzsmWxService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -46,4 +50,47 @@ public class TSzsmWxServiceImpl extends ServiceImpl<TSzsmWxMapper, TSzsmWx> impl
             }
         }
     }
+
+    @Override
+    public String subscribeMessage(Long id,String code,String clientId) {
+        if(id==null){
+            return "error";
+        }
+        TSzsmWx szsmWx = getById(id);
+        //1,获取获取token
+        String accessToken =null;
+        TSzsmWx wx = getById(1);
+        accessToken = wx.getAvatarUrl();
+        String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="+accessToken;
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("template_id", "NVmdaK4MwygT63ME830pwM6wZt4eufxhBr6jlQ2XXJ4");
+        jsonObject.put("touser", szsmWx.getOpenId());
+        Map<String,String> map = new HashMap<>();
+        //取货码 code
+        map.put("character_string1",code);
+        //取货点 clientId
+        map.put("thing2",clientId);
+        //温馨提示
+        map.put("thing5","");
+        jsonObject.put("data", map);
+        jsonObject.put("miniprogram_state","formal");
+        jsonObject.put("lang","zh_CN");
+        String reqJsonStr = JsonUtil.objToString(jsonObject);
+        JSONObject  result = null;
+        try {
+            result = JSON.parseObject(HttpClientSslUtils.doPost(url, reqJsonStr));
+            if (result != null) {
+                String errmsg = result.getString("errmsg");
+                if(errmsg.equals("ok")){
+                    szsmWx.setIfSubscribe("0");
+                    updateById(szsmWx);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "success";
+    }
+
+
 }

+ 2 - 2
src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
     name: wx-server
   profiles:
     # 打包或运行时,换这里:sit测试,prod正式
-    active: sit
+    active: prod
   cloud:
     config:
       name: wx-server
@@ -66,7 +66,7 @@ spring:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://10.0.0.153:49001/eureka/,http://10.0.0.152:49001/eureka/
+      defaultZone: http://112.74.63.148:49001/eureka/,http://47.112.127.131:49001/eureka/
     register-with-eureka: true
   instance:
     prefer-ip-address: true