Merge remote-tracking branch 'origin/master'

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

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

@@ -1,8 +1,6 @@
 package cn.com.taiji.core.entity.ass;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
-import cn.com.taiji.core.entity.dict.ass.ReSignStatus;
-import cn.com.taiji.core.entity.dict.ass.UpgradeStatus;
 import cn.com.taiji.core.entity.dict.basic.*;
 import cn.com.taiji.core.entity.dict.issue.ShippingStatus;
 import lombok.Getter;
@@ -173,14 +171,6 @@ public class AssVehicleInfoChange extends StringPropertyUUIDEntity {
     @Column(name = "AGREE_TIME")
     private LocalDateTime agreeTime;//签约协议时间
 
-    @NotNull
-    @Column(name = "UPGRADE_STATUS")
-    @Enumerated(EnumType.STRING)
-    private UpgradeStatus upgradeStatus;//设备升级状态
-    @NotNull
-    @Column(name = "SIGN_STATUS")
-    @Enumerated(EnumType.STRING)
-    private ReSignStatus signStatus;//重新签约状态
     @NotNull
     @Column(name = "INSERT_TIME")
     private LocalDateTime insertTime;//创建时间

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/ass/AssOrderinfoController.java

@@ -4,6 +4,7 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.managew.api.MyValidController;
+import cn.com.taiji.managew.dto.ass.AssOrderCancelDTO;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
 import cn.com.taiji.managew.dto.ass.AssReviewRequestDTO;
 import cn.com.taiji.managew.manager.ass.AssOrderinfoManager;
@@ -45,5 +46,12 @@ public class AssOrderinfoController extends MyValidController {
         return ApiResponse.success();
     }
 
+    @ApiOperation("售后订单取消")
+    @PostMapping("/cancel")
+    public ApiResponse<Void> cancel(@Valid @RequestBody AssOrderCancelDTO req) throws ManagerException {
+        manager.cancel(req);
+        return ApiResponse.success();
+    }
+
 
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/ass/CustomerInfoChangeController.java

@@ -1,10 +1,11 @@
 package cn.com.taiji.managew.api.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.web.ApiResponse;
 import cn.com.taiji.managew.api.MyValidController;
-import cn.com.taiji.managew.dto.ass.*;
+import cn.com.taiji.managew.dto.ass.AssCustomerInfoChangeDetailReqDTO;
+import cn.com.taiji.managew.dto.ass.AssCustomerInfoChangeDetailResDTO;
+import cn.com.taiji.managew.dto.ass.CustomerInfoChangeApplyDTO;
 import cn.com.taiji.managew.manager.ass.CustomerInfoChangeManager;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,26 +25,13 @@ public class CustomerInfoChangeController extends MyValidController {
     @Autowired
     private CustomerInfoChangeManager manager;
 
-    @ApiOperation(value = "01-信息修改审核分页")
-    @PostMapping("/page")
-    public ApiResponse<Pagination> page(@Valid @RequestBody AssCustomerInfoChangePageReqDTO reqDto) throws ManagerException {
-        return ApiResponse.of(manager.page(reqDto));
-    }
-
-    @ApiOperation(value = "02-信息修改详情")
+    @ApiOperation(value = "01-信息修改详情")
     @PostMapping("/detail")
     public ApiResponse<AssCustomerInfoChangeDetailResDTO> detail(@Valid @RequestBody AssCustomerInfoChangeDetailReqDTO reqDto) throws ManagerException {
         return ApiResponse.of(manager.detail(reqDto));
     }
 
-    @ApiOperation(value = "03-信息修改审核")
-    @PostMapping("/audit")
-    public ApiResponse audit(@Valid @RequestBody CustomerInfoChangeAuditDTO reqDto) throws ManagerException {
-        manager.audit(reqDto);
-        return ApiResponse.success().setMessage("操作成功");
-    }
-
-    @ApiOperation(value ="04-信息修改申请")
+    @ApiOperation(value ="02-信息修改申请")
     @PostMapping("/apply")
     public ApiResponse apply(@Valid @RequestBody CustomerInfoChangeApplyDTO reqDto) throws ManagerException {
         manager.apply(reqDto);

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

@@ -0,0 +1,22 @@
+package cn.com.taiji.managew.dto.ass;
+
+import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+@ApiModel(description = "售后订单取消")
+public class AssOrderCancelDTO extends AbstractStaffBizRequestDTO {
+
+    @ApiModelProperty(value = "售后订单编号", required = true)
+    @NotBlank
+    private String orderNo;
+
+    @ApiModelProperty(value = "审核不通过原因", required = true)
+    @NotBlank
+    private String reason;
+
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/product/product/ProductAddRequestDto.java

@@ -1,6 +1,5 @@
 package cn.com.taiji.managew.dto.product.product;
 
-import cn.com.taiji.common.pub.StringTools;
 import cn.com.taiji.common.valid.ViolationValidator;
 import cn.com.taiji.core.dto.AbstractStaffBizRequestDTO;
 import cn.com.taiji.core.entity.dict.basic.CardType;

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

@@ -3,6 +3,7 @@ package cn.com.taiji.managew.manager.ass;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.managew.dto.ass.AssOrderCancelDTO;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
 import cn.com.taiji.managew.dto.ass.AssReviewRequestDTO;
 
@@ -17,4 +18,6 @@ public interface AssOrderinfoManager {
     Pagination page(AssOrderinfoPageRequestDTO dto) throws ManagerException;
 
     void review(AssReviewRequestDTO req) throws ManagerException;
+
+    void cancel(AssOrderCancelDTO req) throws ManagerException;
 }

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

@@ -3,12 +3,16 @@ package cn.com.taiji.managew.manager.ass;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
+import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.user.Staff;
+import cn.com.taiji.core.model.comm.protocol.ias.ass.AbstractAssResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.AssOrderAuditRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.AssOrderAuditResponse;
+import cn.com.taiji.core.model.comm.protocol.ias.ass.AssOrderCancelRequest;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.core.repo.request.ass.AssOrderinfoPageRequest;
+import cn.com.taiji.managew.dto.ass.AssOrderCancelDTO;
 import cn.com.taiji.managew.dto.ass.AssOrderinfoPageRequestDTO;
 import cn.com.taiji.managew.dto.ass.AssReviewRequestDTO;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
@@ -54,6 +58,16 @@ public class AssOrderinfoManagerImpl extends AbstractManagewManager implements A
         sysPersistOperateLog(response.getType(),response.getId(),req.getOrderSource(),findOpenIdByToken(req.getAccessToken()),response.getType().getValue());
     }
 
+    @Override
+    public void cancel(AssOrderCancelDTO req) throws ManagerException {
+        AssOrderCancelRequest request = copyProperties(req, new AssOrderCancelRequest());
+        request.setOpenId(req.getStaffId());
+        request.setStaffNum(req.getStaffId());
+        request.setRefundStatus(0);
+        jsonPostRepeat(request);
+        sysPersistOperateLog(OperateType.ORDER_CANCEL,req.getOrderNo(),req.getOrderSource(),findOpenIdByToken(req.getAccessToken()),"订单取消");
+    }
+
     private AssOrderInfoModel toModel(AssOrderinfo orderInfo) {
         AssOrderInfoModel model = new AssOrderInfoModel();
         copyProperties(orderInfo, model);

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

@@ -1,13 +1,12 @@
 package cn.com.taiji.managew.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.model.dao.Pagination;
-import cn.com.taiji.managew.dto.ass.*;
+import cn.com.taiji.managew.dto.ass.AssCustomerInfoChangeDetailReqDTO;
+import cn.com.taiji.managew.dto.ass.AssCustomerInfoChangeDetailResDTO;
+import cn.com.taiji.managew.dto.ass.CustomerInfoChangeApplyDTO;
 
 public interface CustomerInfoChangeManager {
 
-    Pagination page(AssCustomerInfoChangePageReqDTO reqDto) throws ManagerException;
     AssCustomerInfoChangeDetailResDTO detail(AssCustomerInfoChangeDetailReqDTO reqDto) throws ManagerException;
-    void audit(CustomerInfoChangeAuditDTO reqDto) throws ManagerException;
     void apply(CustomerInfoChangeApplyDTO reqDto) throws ManagerException;
 }

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

@@ -1,7 +1,6 @@
 package cn.com.taiji.managew.manager.ass;
 
 import cn.com.taiji.common.manager.ManagerException;
-import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.core.entity.ass.AssCustomerInfoChange;
 import cn.com.taiji.core.entity.ass.AssOrderinfo;
 import cn.com.taiji.core.entity.basic.QtkCustomerInfo;
@@ -13,20 +12,19 @@ import cn.com.taiji.core.manager.cache.RedisKeyGenerator;
 import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.CommCustomerInfoChangeResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.CustomerInfoChangeApplyRequest;
-import cn.com.taiji.core.model.comm.protocol.ias.ass.CustomerInfoChangeAuditRequest;
 import cn.com.taiji.core.repo.jpa.ass.AssCustomerInfoChangeRepo;
 import cn.com.taiji.core.repo.jpa.ass.AssOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkCustomerInfoRepo;
 import cn.com.taiji.core.repo.jpa.user.StaffRepo;
-import cn.com.taiji.managew.dto.ass.*;
+import cn.com.taiji.managew.dto.ass.AssCustomerInfoChangeDetailReqDTO;
+import cn.com.taiji.managew.dto.ass.AssCustomerInfoChangeDetailResDTO;
+import cn.com.taiji.managew.dto.ass.CustomerInfoChangeApplyDTO;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
 import cn.com.taiji.managew.model.ass.AssCustomerInfoChangeModel;
 import cn.com.taiji.managew.model.ass.AssOrderInfoModel;
-import cn.com.taiji.managew.repo.jpa.request.ass.AssOrderInfoPageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Service
@@ -43,45 +41,6 @@ public class CustomerInfoChangeManagerImpl extends AbstractManagewManager implem
     @Autowired
     private MinioUtil minioUtil;
 
-    @Override
-    public Pagination page(AssCustomerInfoChangePageReqDTO reqDto) throws ManagerException {
-        AssOrderInfoPageRequest request = copyProperties(reqDto, new AssOrderInfoPageRequest());
-        request.setOrderType(AssOrderType.USER_UPDATE);
-        //处理审核时间
-        if(reqDto.getAuditStartTime() != null){
-            request.setAuditStartTime(reqDto.getAuditStartTime().atStartOfDay());
-        }
-        if(reqDto.getAuditEndTime() != null){
-            request.setAuditEndTime(reqDto.getAuditEndTime().plusDays(1).atStartOfDay());
-        }
-        String agencyId = findAgencyIdByToken(reqDto.getAccessToken());
-        if(!"52010106004".equals(agencyId)){
-            request.setAgencyId(agencyId);
-        }
-        return orderInfoRepo.page(request).convertResult(this::toModel);
-
-    }
-
-    private AssCustomerInfoChangePageResDTO toModel(AssOrderinfo orderInfo) {
-        AssCustomerInfoChangePageResDTO model = new AssCustomerInfoChangePageResDTO();
-        copyProperties(orderInfo, model);
-        //处理业务类型
-        model.setOrderType(orderInfo.getOrderType().getDesc());
-        //处理审核人
-        String openId = orderInfo.getAuditOpenId();
-        if(hasText(openId)){
-            if("-1".equals(openId)){
-                model.setAuditName("系统");
-            }else {
-                Staff staff = staffRepo.findByOpenId(openId);
-                if (staff != null) {
-                    model.setAuditName(staff.getStaffName());
-                }
-            }
-        }
-        return model;
-    }
-
     @Override
     public AssCustomerInfoChangeDetailResDTO detail(AssCustomerInfoChangeDetailReqDTO reqDto) throws ManagerException {
         AssOrderinfo order = orderInfoRepo.findByOrderNo(reqDto.getOrderNo());
@@ -113,20 +72,6 @@ public class CustomerInfoChangeManagerImpl extends AbstractManagewManager implem
         return res;
     }
 
-    @Override
-    public void audit(CustomerInfoChangeAuditDTO reqDto) throws ManagerException {
-        CustomerInfoChangeAuditRequest request = copyProperties(reqDto, new CustomerInfoChangeAuditRequest());
-        request.setType(reqDto.getUserType().getCode()+"");
-        request.setAuditTime(LocalDateTime.now());
-        CommCustomerInfoChangeResponse response = jsonPostRepeat(request);
-        //记录日志
-        persistOperateLog(OperateType.CUSTOMER_INFO_CHANGE_AUDIT, response.getOrderNo(), reqDto.getOrderSource(), findOpenIdByToken(reqDto.getAccessToken()), "用户信息变更审核" + response.getMsg()+"");
-        //响应
-        if (!"1".equals(response.getCode())) {
-            throw new ManagerException("出错了" + response.getMsg());
-        }
-    }
-
     @Override
     public void apply(CustomerInfoChangeApplyDTO reqDto) throws ManagerException {
         valid(reqDto);

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

@@ -11,7 +11,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.ass.AssOrderAuditResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.ias.dict.DataType;
-import cn.com.taiji.ias.manager.ass.base.CustomerInfoChangeAuditManager;
+import cn.com.taiji.ias.manager.ass.customerInfoChange.CustomerInfoChangeAuditManager;
 import cn.com.taiji.ias.manager.ass.releasePlate.ReleasePlateReviewManager;
 import cn.com.taiji.ias.model.ServiceLogEvent;
 import org.springframework.beans.factory.annotation.Autowired;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/base/AbstractCustomerInfoChangeManager.java → zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/customerInfoChange/AbstractCustomerInfoChangeManager.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.ass.base;
+package cn.com.taiji.ias.manager.ass.customerInfoChange;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.core.entity.ass.AssCustomerInfoChange;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/base/CustomerInfoChangeApplyManager.java → zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/customerInfoChange/CustomerInfoChangeApplyManager.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ias.manager.ass.base;
+package cn.com.taiji.ias.manager.ass.customerInfoChange;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.json.JsonTools;

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

@@ -1,10 +1,9 @@
-package cn.com.taiji.ias.manager.ass.base;
+package cn.com.taiji.ias.manager.ass.customerInfoChange;
 
 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.basic.QtkCustomerInfo;
-import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
 import cn.com.taiji.core.entity.dict.ass.AssOrderStep;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.AssOrderAuditRequest;

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

@@ -9,8 +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.base.CustomerInfoChangeApplyManager;
+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;
 import cn.com.taiji.ias.manager.ass.releasePlate.ReleasePlateApplyManager;
@@ -53,8 +52,6 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
 //    private CustomerInfoChangeAuditManager changeAuditManager;
     @Autowired
     private AssOrderAuditManager assOrderAuditManager;
-    @Autowired
-    private AssOrderCancelManager assOrderCancelManager;
 
     public AssServiceHandler() {
         super(IasServiceType.ASS);
@@ -66,8 +63,6 @@ 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:

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ygz/nio/AbstractCommNioManager.java

@@ -85,26 +85,27 @@ public class AbstractCommNioManager extends AbstractManager {
             oldLog.setUpdateTime(LocalDateTime.now());
             logRepo.save(oldLog);
             return;
-        }
-        //成功
-        if (log.getStatus() == InterfaceStatus.SUCCESS) {
-            log.setUniqueId(uniqueId);
-            log.setOperation(operation);
-            log.setNioTransferType(cmd.getTransferType());
-            log.setUpdateTime(LocalDateTime.now());
-            log.setResendTimes(0);
-            log.setSendStatus(YgzSendStatus.SEND_SUCCESS);
-            log.setSource(dataSource);
-            logRepo.persist(log);
-        } else {
-            log.setUniqueId(uniqueId);
-            log.setOperation(operation);
-            log.setNioTransferType(cmd.getTransferType());
-            log.setUpdateTime(LocalDateTime.now());
-            log.setResendTimes(0);
-            log.setSendStatus(YgzSendStatus.WAIT_SEND);
-            log.setSource(dataSource);
-            logRepo.persist(log);
+        }else{
+            //成功
+            if (log.getStatus() == InterfaceStatus.SUCCESS) {
+                log.setUniqueId(uniqueId);
+                log.setOperation(operation);
+                log.setNioTransferType(cmd.getTransferType());
+                log.setUpdateTime(LocalDateTime.now());
+                log.setResendTimes(0);
+                log.setSendStatus(YgzSendStatus.SEND_SUCCESS);
+                log.setSource(dataSource);
+                logRepo.persist(log);
+            } else {
+                log.setUniqueId(uniqueId);
+                log.setOperation(operation);
+                log.setNioTransferType(cmd.getTransferType());
+                log.setUpdateTime(LocalDateTime.now());
+                log.setResendTimes(0);
+                log.setSendStatus(YgzSendStatus.WAIT_SEND);
+                log.setSource(dataSource);
+                logRepo.persist(log);
+            }
         }
     }
 }