Przeglądaj źródła

修改订单状态发送短信

humuyu 2 lat temu
rodzic
commit
6d58c3462f

+ 1 - 1
eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -329,7 +329,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
         ContractOrderEntity contractOrderEntity = contractOrderRepository
                 .getContractOrderWithBizNo(req.getBusinessNo());
         bankOrderService.updateStatus(contractOrderEntity.getBusinessNo(),
-                StatusEnum.NotaryStatusEnum.SUBMIT.getStatus().toString(), req.getReturnReason());
+        		OrderConstant.ORDER_STATUS_UNSUBMIT, req.getReturnReason());
         response.success("退回成功");
         // 3---审核退回---1个客户经理
         smsTemplateService.auditBack(req.getBusinessNo());

+ 6 - 8
eladmin-system/src/main/java/me/zhengjie/application/bank/service/impl/BankOrderServiceImpl.java

@@ -209,20 +209,18 @@ public class BankOrderServiceImpl implements BankOrderService {
     	
         ContractOrderEntity order = new ContractOrderEntity();
         order.setBusinessNo(businessNo);
-        order.setStatus(status);
-      
-    	
+        order.setStatus(status);    	
         order.setUpdateTime(new Date());
         if (OrderConstant.ORDER_STATUS_UNSUBMIT.equals(status)) {
             order.setReturnReason(message);
-        } else if (OrderConstant.ORDER_STATUS_REJECTED.equals(status)) {
-            order.setRejectReason(message);
-            order.setRejectTime(new Date());
-        }else if(NotaryStatusEnum.SUBMIT.getStatus().equals(Integer.valueOf(status))) {
-        	Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+            //增加公证用户
+            Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         	Object securityContextUser = authentication.getPrincipal();
     		OnlineUserDto userDto = (OnlineUserDto) securityContextUser;
             order.setNotaryUserId(userDto.getUserId().toString());
+        } else if (OrderConstant.ORDER_STATUS_REJECTED.equals(status)) {
+            order.setRejectReason(message);
+            order.setRejectTime(new Date());
         }
         contractOrderRepository.updateWithBizNo(order);
     }

+ 13 - 0
eladmin-system/src/main/java/me/zhengjie/domain/order/OrderConstant.java

@@ -14,12 +14,25 @@ public class OrderConstant {
     public static final Integer CONTRACT_TYPE_GUARANTEE = 3;
     public static final Integer CONTRACT_TYPE_CREDIT = 4;
     /**
+     * 	DELETE(-1, "已删除"),
+        SUBMIT(0, "待提交"),
+        VERIFY(1, "待审核"),
+        NOTARIZED(2,"待公证"),
+        PASS(3, "已签发"),
+        REJECT(4, "已驳回"),
      * 订单状态
      */
+    //已删除
+    public static final String ORDER_STATUS_DELETE = "-1";
+    //待提交
     public static final String ORDER_STATUS_UNSUBMIT = "0";
+    //待审核
     public static final String ORDER_STATUS_UNCHECKED = "1";
+    //待公证
     public static final String ORDER_STATUS_UNNOTARIZED = "2";
+    //已签发
     public static final String ORDER_STATUS_NOTARIZED = "3";
+    //已驳回
     public static final String ORDER_STATUS_REJECTED = "4";
     /**
      * 公证书生成方式标记