bug修复

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

@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
 public class DreOrderServiceImpl extends ServiceImpl<DreOrderMapper, DreOrder> implements DreOrderService {
 
 
-    private static final String URL = "https://smartpark.caih.com/vuepay2/#/catering?id=";
+    private static final String URL = "https://smartpark.caih.com/vuepay/#/catering?id=";
 
     @Autowired
     private ISysAsyncTaskService sysAsyncTaskService;

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

@@ -66,7 +66,7 @@ public class DreUserServiceImpl extends ServiceImpl<DreUserMapper, DreUser> impl
 
 
     public void checkIsSend(List<DreUser> list){
-        list = list.stream().filter(dreUser -> 1 == dreUser.getIsSend() && null == dreUser.getOpenId()).collect(Collectors.toList());
+        list = list.stream().filter(dreUser -> 1 == dreUser.getIsSend() && StringUtils.isBlank(dreUser.getOpenId())).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(list)){
             StringBuilder msg = new StringBuilder();
             msg.append("配送员-");

src/main/java/com/usky/dxtop/service/job/CenterUserJob.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.usky.dxtop.common.utils.SecurityUtils;
 import com.usky.dxtop.common.utils.StringUtils;
-
-import com.usky.dxtop.framework.web.domain.server.Sys;
 import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.model.Staff;
 import com.usky.dxtop.model.SysDept;
@@ -20,10 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.*;
 
 @Component("centerUserJob")
 @Slf4j
@@ -131,6 +126,9 @@ public class CenterUserJob {
             pwd = CenterDecryptUtil.decryptByPrivateKey(CenterDecryptUtil.KEY,staff.getOsspassword());
         }catch (Exception e){
 
+        }
+        if (StringUtils.isNotBlank(staff.getOsspassword())){
+            pwd = "12345678";
         }
         sysUser.setPassword(SecurityUtils.encryptPassword(pwd));
         sysUser.setPhonenumber(staff.getContacts());
@@ -152,4 +150,5 @@ public class CenterUserJob {
         sysUser.setDeptId(sysDept.getDeptId());
         return sysUser;
     }
+
 }

src/test/java/com/usky/dxtop/SmApiTest.java

@@ -1,15 +1,13 @@
 package com.usky.dxtop;
 
-import com.usky.dxtop.common.utils.DateUtils;
 import com.usky.dxtop.common.utils.http.HttpUtils;
-import com.usky.dxtop.framework.web.domain.server.Sys;
 import com.usky.dxtop.model.Dept;
 import com.usky.dxtop.service.DeptService;
 import com.usky.dxtop.service.api.WxApi;
 import com.usky.dxtop.service.job.CenterUserJob;
 import com.usky.dxtop.service.job.SmJob;
+import com.usky.dxtop.service.util.CenterDecryptUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.usermodel.DateUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +16,6 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.TreeMap;
 
@@ -101,11 +98,24 @@ public class SmApiTest {
 
 
         SmJob.PersonParam personParam = new SmJob.PersonParam();
-        personParam.setBlurry("谢妍");
+        personParam.setBlurry("admin");
         smJob.personApi(personParam);
     }
 
 
 
+    @Test
+    public void test7(){
+        try {
+            String pwd = CenterDecryptUtil.decryptByPrivateKey(CenterDecryptUtil.KEY,"");
+            System.out.println(pwd);
+        }catch (Exception e){
+
+        }
+    }
+
+
+
+
 
 }