Browse Source

新增订单详情允许董事长审核查看

anderx 7 months ago
parent
commit
3effd01272

+ 6 - 2
src/main/java/com/company/Main.java

@@ -44,13 +44,16 @@ public class Main {
         long sdk = Finance.NewSdk();
         ret = Finance.Init(sdk, "wwd1f2fb82952be74c", "zJ*****************************ew");
         System.out.println(ret);
+        String arg0 = args[0];
+        arg0="1";
         if(ret != 0){
             Finance.DestroySdk(sdk);
             System.out.println("init sdk err ret " + ret);
             return;
+        }else {
+            System.out.println("init sdk ok");
         }
-
-        if (args[0].equals("1")) {
+        if (arg0.equals("1")) {
             //拉取会话存档
             int seq = Integer.parseInt(args[1]);
             int limit = Integer.parseInt(args[2]);
@@ -61,6 +64,7 @@ public class Main {
             //每次使用GetChatData拉取存档前需要调用NewSlice获取一个slice,在使用完slice中数据后,还需要调用FreeSlice释放。
             long slice = Finance.NewSlice();
             ret = Finance.GetChatData(sdk, seq, limit, proxy, passwd, timeout, slice);
+            System.out.println("==============="+ret);
             if (ret != 0) {
                 System.out.println("getchatdata ret " + ret);
                 Finance.FreeSlice(slice);

+ 2 - 1
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -34,7 +34,8 @@ public class PushOrderService {
     public String processStatusConstant(TOrderNewBo t){
         //tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getProcessStatus(),tOrder.getApproval()
         //流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
-        if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ){
+        if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)
+        ||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT) ){
             return t.getContractPictureUrl();
         }else if ((TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN)
                 ||TokenManager.hasRole(AFTConstants.SALESMAN_ASSISTANT))&&