浏览代码

人员同步完成

yq 3 年之前
父节点
当前提交
33fad6d7e2

+ 1 - 1
src/main/java/com/usky/dxtop/model/Staff.java

@@ -113,7 +113,7 @@ public class Staff implements Serializable {
     /**
      * 部门id
      */
-    private String deptId;
+    private Long deptId;
 
     /**
      * 部门名称

+ 2 - 2
src/main/java/com/usky/dxtop/service/api/SmApi.java

@@ -11,12 +11,12 @@ import java.util.*;
  */
 public class SmApi {
 
-    private static final String URL = "http://114.55.24.6:8086";
+    private static final String URL = "https://smartpark.caih.com/zkxt";
 
 
     private static final String KEY = "DMERPYT!@#$QWER2021+{:>";
 
-    private static final String SIGN_HEAD = "X_YT_ACCESS_TOKEN";
+    private static final String SIGN_HEAD = "XYTACCESSTOKEN";
     /**
      * 人员信息
      */

+ 1 - 1
src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -238,8 +238,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public void checkOrder(Order order,String result,String param){
         JSONObject obj= JSON.parseObject(result);
-        String trxstatus = obj.get("trxstatus").toString();
         if ("0000".equals(obj.get("status").toString())){
+            String trxstatus = obj.get("trxstatus").toString();
             //交易成功
             if ("2".equals(trxstatus)) {
                 paySuccess(order);

+ 1 - 1
src/main/java/com/usky/dxtop/service/impl/StaffServiceImpl.java

@@ -109,7 +109,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
         map.put("mob",staff.getSId());
         map.put("groupid",staff.getDeptId());
         map.put("tel",staff.getContacts());
-        map.put("level_name","测试卡");
+        map.put("level_name","员工卡");
         MsgLog msgLog = new MsgLog();
         msgLog.setBusinessId(staff.getSId());
         msgLog.setExchange(ProfileConsumeConfig.NAME);

+ 1 - 1
src/main/java/com/usky/dxtop/service/job/SmJob.java

@@ -84,7 +84,7 @@ public class SmJob {
                 }
                 //发送人员信息
                 if (StringUtils.isNotBlank(date.getCardId()) && null != dept){
-                    date.setDeptId(dept.getDId().toString());
+                    date.setDeptId(dept.getDId());
                     staffService.personSendMessage(date,type);
                 }
                 //发送人脸信息