调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssCustomerInfoChange.java

@@ -105,14 +105,14 @@ public class AssCustomerInfoChange extends StringPropertyUUIDEntity {
     @Size(max = 256)
     @Column(name = "OLD_AGENT_NEG_URL")
     private String oldAgentNegUrl;//原经办人证件反面地址
-    @Size(max = 32)
-    @Column(name = "CANCEL_OPEN_ID")
-    private String cancelOpenId;//取消人
-    @Column(name = "CANCEL_TIME")
-    private LocalDateTime cancelTime;//取消时间
-    @Size(max = 255)
-    @Column(name = "CANCEL_REASON")
-    private String cancelReason;//取消原因
+//    @Size(max = 32)
+//    @Column(name = "CANCEL_OPEN_ID")
+//    private String cancelOpenId;//取消人
+//    @Column(name = "CANCEL_TIME")
+//    private LocalDateTime cancelTime;//取消时间
+//    @Size(max = 255)
+//    @Column(name = "CANCEL_REASON")
+//    private String cancelReason;//取消原因
     @Size(max = 50)
     @Column(name = "CLOSE_OPEN_ID")
     private String closeOpenId;//关闭人id

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/ass/AssOrderCancelRequest.java

@@ -18,7 +18,7 @@ import java.time.LocalDateTime;
 public class AssOrderCancelRequest extends AbstractSignTypeRequest<AbstractAssResponse> {
 
     public AssOrderCancelRequest() {
-        super(OrderServiceCmd.CANCEL);
+        super(AssServiceCmd.ORDERCANCEL);
     }
 
     @NotBlank

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/ass/AssOrderinfoPageRequestDTO.java

@@ -1,7 +1,6 @@
 package cn.com.taiji.managew.dto.ass;
 
 import cn.com.taiji.core.dto.AbstractStaffBizPageRequestDTO;
-import cn.com.taiji.core.entity.dict.AuditStatus;
 import cn.com.taiji.core.entity.dict.ass.AssOrderType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/ass/AssOrderinfoManagerImpl.java

@@ -61,7 +61,7 @@ public class AssOrderinfoManagerImpl extends AbstractManagewManager implements A
     @Override
     public void cancel(AssOrderCancelDTO req) throws ManagerException {
         AssOrderCancelRequest request = copyProperties(req, new AssOrderCancelRequest());
-        request.setOpenId(req.getStaffId());
+        request.setOpenId(findOpenIdByToken(req.getAccessToken()));
         request.setStaffNum(req.getStaffId());
         request.setRefundStatus(0);
         jsonPostRepeat(request);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/ass/AssOrderInfoModel.java

@@ -118,4 +118,13 @@ public class AssOrderInfoModel {
 
     @ApiModelProperty(value = "审核人")
     private String auditName;
+
+    @ApiModelProperty(value = "取消人")
+    private String cancelOpenId;//取消人
+    @ApiModelProperty(value = "取消人")
+    private String cancelName;//取消人
+    @ApiModelProperty(value = "取消时间")
+    private LocalDateTime cancelTime;//取消时间
+    @ApiModelProperty(value = "取消原因")
+    private String cancelReason;//取消原因
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/AssOrderCancelManager.java

@@ -1,10 +1,10 @@
 package cn.com.taiji.ias.manager.ass;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.core.entity.ass.AssCustomerInfoChange;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
-import cn.com.taiji.core.entity.dict.issue.IssueOrderStatus;
 import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import cn.com.taiji.core.entity.dict.issue.OrderPayStatus;
 import cn.com.taiji.core.entity.issue.IssueOrderPay;
@@ -17,8 +17,10 @@ import cn.com.taiji.core.model.comm.protocol.ias.order.OrderCancelRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.order.RetunInfoModel;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
+import cn.com.taiji.core.repo.jpa.ass.AssCustomerInfoChangeRepo;
 import cn.com.taiji.ias.dict.DataType;
 import cn.com.taiji.ias.model.ServiceLogEvent;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -32,6 +34,9 @@ import java.util.Map;
 @Service
 public class AssOrderCancelManager extends AbstractAssManager<AssOrderCancelRequest> {
 
+    @Autowired
+    private AssCustomerInfoChangeRepo customerInfoChangeRepo;
+
     public AssOrderCancelManager() {
         super(DataType.ASSORDER_CANCEL);
     }
@@ -51,7 +56,7 @@ public class AssOrderCancelManager extends AbstractAssManager<AssOrderCancelRequ
     protected void businessValidateInternal(ErrorMsgBuilder builder, AssOrderCancelRequest request,
         ServiceLogEvent event, Map<String, Object> dataStream) throws ServiceHandleException {
         AssOrderinfo order = checkOrder(request.getOrderNo());
-        if (!IssueOrderStatus.NORMAL.equals(order.getOrderStatus())) {
+        if (!AssOrderStatus.NORMAL.equals(order.getOrderStatus())) {
             throw newBusinessException("当前订单状态:"+order.getOrderStatus().getStatus());
         }
         // 取消订单的操作来源要判断
@@ -78,8 +83,18 @@ public class AssOrderCancelManager extends AbstractAssManager<AssOrderCancelRequ
         AssOrderinfo order = (AssOrderinfo)dataStream.get(ORDER);
         // 保存订单取消原因
         order.setOrderStatus(AssOrderStatus.CANCEL);
+        order.setCancelOpenId(request.getOpenId());
+        order.setCancelReason(request.getReason());
+        order.setCancelTime(now);
         switch (order.getOrderType()) {
             case USER_UPDATE:
+                AssCustomerInfoChange change = customerInfoChangeRepo.findByOrderNo(order.getOrderNo());
+                if(change != null){
+                    change.setCloseOpenId(request.getOpenId());
+                    change.setCloseReason(request.getReason());
+                    change.setCloseTime(now);
+                    customerInfoChangeRepo.merge(change);
+                }
                 break;
             case RELEASE_VEHICLE://解除车牌占用
                 break;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/customerInfoChange/CustomerInfoChangeAuditManager.java

@@ -53,6 +53,6 @@ public class CustomerInfoChangeAuditManager extends AbstractCustomerInfoChangeMa
 
         change.setCloseOpenId(staff.getOpenId());
         change.setCloseTime(now);
-        change.setCloseReason(request.getReason());
+        change.setCloseReason(hasText(request.getReason())?request.getReason():"员工审核通过，待设备升级");
     }
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/AssServiceHandler.java

@@ -9,6 +9,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.*;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.vehicleInfoChange.VehicleChangeCancelRequest;
 import cn.com.taiji.ias.manager.ass.AssOrderAuditManager;
+import cn.com.taiji.ias.manager.ass.AssOrderCancelManager;
 import cn.com.taiji.ias.manager.ass.customerInfoChange.CustomerInfoChangeApplyManager;
 import cn.com.taiji.ias.manager.ass.device.DeviceLossManager;
 import cn.com.taiji.ias.manager.ass.releasePlate.PlateOccupyQueryManager;
@@ -55,6 +56,8 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
 //    private CustomerInfoChangeAuditManager changeAuditManager;
     @Autowired
     private AssOrderAuditManager assOrderAuditManager;
+    @Autowired
+    private AssOrderCancelManager assOrderCancelManager;
 
     public AssServiceHandler() {
         super(IasServiceType.ASS);
@@ -66,6 +69,8 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
         switch (cmd) {
             case ORDERAUDIT:
                 return assOrderAuditManager.serviceHandle((AssOrderAuditRequest) request, jsonReq.getIfCode(), jsonReq.getReqId(), reqInfo);
+            case ORDERCANCEL:
+                return assOrderCancelManager.serviceHandle((AssOrderCancelRequest) request, jsonReq.getIfCode(), jsonReq.getReqId(), reqInfo);
             case RESIGN:
                 return resignManager.serviceHandle((ResignRequest) request);
             case PLATEOCCUPYQUERY: