修改微信名转码，定时器更新智能平台状态查询修改

core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java

@@ -314,7 +314,12 @@ public class LoginPwdController extends BaseController {
             }
             }
 
 
             dataMapping.put("wx_head_img_url",headimgurl);
             dataMapping.put("wx_head_img_url",headimgurl);
-            dataMapping.put("wx_nick_name",nickname);
+            try{
+                dataMapping.put("wx_nick_name",URLEncoder.encode(nickname,"utf-8"));
+            }catch(UnsupportedEncodingException u) {
+                return ResponseData.error("微信名转码失败！请暂时更换后登录");
+            }
+
             Integer integer = hhrUserMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
             Integer integer = hhrUserMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
             if (integer == 1) {
             if (integer == 1) {
                 return this.loginvalid(null, sysUser.getAccount(), openid);
                 return this.loginvalid(null, sysUser.getAccount(), openid);

task/src/main/java/com/winsun/TimingTask/OrderTask.java

@@ -58,14 +58,13 @@ public class OrderTask {
     /**
     /**
      * 更新移动卡的状态
      * 更新移动卡的状态
      */
      */
-    @Scheduled(cron = "0 0/5 * * * ?")
+    @Scheduled(cron = "0 0/4 * * * ?")
     public void updateMobileCardStatus() {
     public void updateMobileCardStatus() {
         log.info("更新预制卡状态开始");
         log.info("更新预制卡状态开始");
         // 有卡品id，并且未审核中的状态
         // 有卡品id，并且未审核中的状态
         Wrapper<Order> wrapper = new EntityWrapper<>();
         Wrapper<Order> wrapper = new EntityWrapper<>();
         wrapper.eq("order_status", "审核中");
         wrapper.eq("order_status", "审核中");
-        wrapper.isNotNull("package_id");
-        wrapper.isNotNull("order_id");
+        wrapper.isNull("kd_order_id");
         List<Order> orders = orderMapper.selectList(wrapper);
         List<Order> orders = orderMapper.selectList(wrapper);
 
 
         // 循环请求获取数据
         // 循环请求获取数据
@@ -94,10 +93,11 @@ public class OrderTask {
                         update.setOrderStatus("待配送");
                         update.setOrderStatus("待配送");
                         orderMapper.updateById(update);
                         orderMapper.updateById(update);
 
 
-                    } else if (json.get("orderStatus").equals("待图片审核") || json.get("orderStatus").equals("作废")) {
+                    } else if (json.get("stateName").equals("待图片审核") || json.get("stateName").equals("作废")) {
                         orderHistory.setStatus(json.getString("orderStatus"));
                         orderHistory.setStatus(json.getString("orderStatus"));
                         orderHistoryMapper.insert(orderHistory);
                         orderHistoryMapper.insert(orderHistory);
-                        update.setThStatus(json.get("orderStatus").toString());
+                        update.setThStatus(json.get("stateName").toString());
+                        update.setMsg(json.getString("stateName"));
                         update.setOrderStatus("异常单");
                         update.setOrderStatus("异常单");
                         orderMapper.updateById(update);
                         orderMapper.updateById(update);
                     }
                     }
@@ -116,7 +116,10 @@ public class OrderTask {
         // 获取审核中的订单
         // 获取审核中的订单
         Wrapper<Order> wrapper = new EntityWrapper<>();
         Wrapper<Order> wrapper = new EntityWrapper<>();
         wrapper.eq("order_status", "审核中");
         wrapper.eq("order_status", "审核中");
-        wrapper.isNull("package_id");
+        wrapper.isNotNull("kd_order_id");
+        wrapper.or();
+        wrapper.eq("order_status", "待配送");
+        wrapper.isNotNull("kd_order_id");
         List<Order> orders = orderMapper.selectList(wrapper);
         List<Order> orders = orderMapper.selectList(wrapper);
 
 
         // 循环请求获取数据
         // 循环请求获取数据
@@ -135,8 +138,8 @@ public class OrderTask {
                     orderHistory.setStatus("智能平台状态获取");
                     orderHistory.setStatus("智能平台状态获取");
 
 
                     // 未获取到需要的状态不做更新
                     // 未获取到需要的状态不做更新
-                    if ("归档".equals(json.get("orderStatus")) || "受理成功【待收费】".equals(json.get("orderStatus"))
-                        || "已收费【待竣工】".equals(json.get("orderStatus")) || "受理成功".equals(json.get("orderStatus"))) {
+                    if ("归档".equals(json.getString("orderStatus")) || "受理成功【待收费】".equals(json.getString("orderStatus"))
+                        || "已收费【待竣工】".equals(json.getString("orderStatus")) || "受理成功".equals(json.getString("orderStatus"))) {
                         orderHistory.setStatus("订单已完成");
                         orderHistory.setStatus("订单已完成");
                         orderHistoryMapper.insert(orderHistory);
                         orderHistoryMapper.insert(orderHistory);