订单管理-订单审核

zhywpt-app-managew/build.gradle

@@ -9,6 +9,7 @@ dependencies {
     implementation "${groupname}:entity-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:comm-core:1.0.0-SNAPSHOT"
     implementation "${groupname}:sample-protocol:1.0.0-SNAPSHOT"
+    implementation "${groupname}:ifmw-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:ats-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:bls-protocol:1.0.0-SNAPSHOT"
     implementation "${groupname}:ias-protocol:1.0.0-SNAPSHOT"

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/issueOrder/IssueOrderExamineController.java

@@ -47,7 +47,7 @@ public class IssueOrderExamineController extends MyValidController {
 
     @ApiOperation(value = "3.审核")
     @PostMapping(value = "/examine")
-    public ApiResponse<Pagination> examine(@Valid @RequestBody OrderExamineReqDTO reqDto) throws ManagerException {
+    public ApiResponse<?> examine(@Valid @RequestBody OrderExamineReqDTO reqDto) throws ManagerException {
         issueOrderExamineManage.examine(reqDto);
         return ApiResponse.success();
     }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/multiple/MultipleEquityAddReqDTO.java

@@ -44,10 +44,10 @@ public class MultipleEquityAddReqDTO extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(name = "会员积分")
     @NotNull
     private Long memberPoints;
-    @ApiModelProperty(name = "ETC设备强绑定权益注销时是否退费(0---是;1---否)")
+    @ApiModelProperty(name = "ETC设备强绑定权益注销时是否退费(1---是;0---否)")
     @NotNull
     @IntegerConstant(values = "0,1")
-    private Long refundOnEtcCancel;
+    private Integer refundOnEtcCancel;
     @ApiModelProperty(name = "有效期格式 1日 2月 3季 4年")
     @NotNull
     @IntegerConstant(values = "1,2,3,4")
@@ -66,11 +66,11 @@ public class MultipleEquityAddReqDTO extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(name = "权益提供方")
     @NotBlank
     private String equityProvider;
-    @ApiModelProperty(name = "是否支持权益产品过户(0---是;1---否)")
+    @ApiModelProperty(name = "是否支持权益产品过户(1---是;0---否)")
     @NotNull
     @IntegerConstant(values = "0,1")
     private Integer transferable;
-    @ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(0---是;1---否)")
+    @ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(1---是;0---否)")
     @NotNull
     @IntegerConstant(values = "0,1")
     private Integer discountCouponUsable;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/multiple/MultipleEquityDetailResDTO.java

@@ -4,11 +4,8 @@ import cn.com.taiji.core.model.comm.protocol.constraint.IntegerConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.persistence.Column;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -49,10 +46,10 @@ public class MultipleEquityDetailResDTO {
     @ApiModelProperty(name = "会员积分")
     @NotNull
     private Long memberPoints;
-    @ApiModelProperty(name = "ETC设备强绑定权益注销时是否退费(0---是;1---否)")
+    @ApiModelProperty(name = "ETC设备强绑定权益注销时是否退费(1是;0否)")
     @NotNull
     @IntegerConstant(values = "0,1")
-    private Long refundOnEtcCancel;
+    private Integer refundOnEtcCancel;
     @ApiModelProperty(name = "有效期格式 1日 2月 3季 4年")
     @NotNull
     @IntegerConstant(values = "1,2,3,4")
@@ -71,11 +68,11 @@ public class MultipleEquityDetailResDTO {
     @ApiModelProperty(name = "权益提供方")
     @NotBlank
     private String equityProvider;
-    @ApiModelProperty(name = "是否支持权益产品过户(0---是;1---否)")
+    @ApiModelProperty(name = "是否支持权益产品过户(1---是;0---否)")
     @NotNull
     @IntegerConstant(values = "0,1")
     private Integer transferable;
-    @ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(0---是;1---否)")
+    @ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(1---是;0---否)")
     @NotNull
     @IntegerConstant(values = "0,1")
     private Integer discountCouponUsable;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/single/SingleEquityAddRequestDTO.java

@@ -37,7 +37,7 @@ public class SingleEquityAddRequestDTO extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(name = "会员积分")
     @NotNull
     private Integer memberPoints;
-    @ApiModelProperty(name = "ETC设备强绑定权益注销时是否退费(0---是;1---否)")
+    @ApiModelProperty(name = "ETC设备强绑定权益注销时是否退费(1---是;0---否)")
     @NotNull
     @IntegerConstant(values = "0,1")
     private Integer refundOnEtcCancel;
@@ -63,11 +63,11 @@ public class SingleEquityAddRequestDTO extends AbstractStaffBizRequestDTO {
     @ApiModelProperty(name = "权益提供方")
     @NotBlank
     private String equityProvider;
-    @ApiModelProperty(name = "是否支持权益产品过户(0---是;1---否)")
+    @ApiModelProperty(name = "是否支持权益产品过户(1---是;0---否)")
     @NotNull
     @IntegerConstant(values = "0,1")
     private Integer transferable;
-    @ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(0---是;1---否)")
+    @ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(1---是;0---否)")
     @NotNull
     @IntegerConstant(values = "0,1")
     private Integer discountCouponUsable;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/equity/single/SingleEquityDetailResDTO.java

@@ -36,7 +36,7 @@ public class SingleEquityDetailResDTO {
     private LocalDateTime endDate;
     @ApiModelProperty(name = "会员积分")
     private Integer memberPoints;
-    @ApiModelProperty(name = "ETC设备强绑定权益注销时是否退费(0---是;1---否)")
+    @ApiModelProperty(name = "ETC设备强绑定权益注销时是否退费(1---是;0---否)")
     private Integer refundOnEtcCancel;
     @ApiModelProperty(name = "有效期格式 1日 2月 3季 4年")
     private Integer validityFormat;
@@ -52,9 +52,9 @@ public class SingleEquityDetailResDTO {
     private LocalDateTime startDate;
     @ApiModelProperty(name = "权益提供方")
     private String equityProvider;
-    @ApiModelProperty(name = "是否支持权益产品过户(0---是;1---否)")
+    @ApiModelProperty(name = "是否支持权益产品过户(1---是;0---否)")
     private Integer transferable;
-    @ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(0---是;1---否)")
+    @ApiModelProperty(name = "是否可使用积分商城所兑换的折扣券(1---是;0---否)")
     private Integer discountCouponUsable;
     @ApiModelProperty(name = "使用有效期")
     private Integer usageValidity;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderExamineManageImpl.java

@@ -4,6 +4,8 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 
 import cn.com.taiji.core.entity.basic.QtkBrandInfo;
+import cn.com.taiji.core.entity.comm.QudaoCallbackResult;
+import cn.com.taiji.core.entity.dict.basic.CallQuDaoType;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import cn.com.taiji.core.entity.dict.issue.ShippingStatus;
@@ -12,7 +14,13 @@ import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
 import cn.com.taiji.core.entity.issue.IssueProduct;
 import cn.com.taiji.core.entity.user.Staff;
 
+import cn.com.taiji.core.model.comm.protocol.ats.model.CallbackModel;
+import cn.com.taiji.core.model.comm.protocol.ats.notice.AtsChannelNoticeRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.notice.AtsChannelNoticeResponse;
+import cn.com.taiji.core.model.comm.protocol.ifmw.GetKeyRequest;
+import cn.com.taiji.core.model.comm.protocol.ifmw.GetKeyResponse;
 import cn.com.taiji.core.repo.jpa.basic.QtkBrandInfoRepo;
+import cn.com.taiji.core.repo.jpa.comm.QudaoCallbackResultRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueOrderinfoExtRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueProductRepo;
@@ -21,6 +29,7 @@ import cn.com.taiji.managew.dto.issueOrder.OrderDetailReqDTO;
 import cn.com.taiji.managew.dto.issueOrder.OrderExaminePageReqDTO;
 import cn.com.taiji.managew.dto.issueOrder.OrderExamineReqDTO;
 import cn.com.taiji.managew.manager.AbstractCommManager;
+import cn.com.taiji.managew.manager.AbstractManagewManager;
 import cn.com.taiji.managew.repo.jpa.request.IssueOrderExaminePageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -38,7 +47,7 @@ import java.util.regex.Pattern;
  * @description: 发行订单审核
  */
 @Service
-public class IssueOrderExamineManageImpl extends AbstractCommManager implements IssueOrderExamineManage {
+public class IssueOrderExamineManageImpl extends AbstractManagewManager implements IssueOrderExamineManage {
 
     @Autowired
     private IssueOrderinfoRepo issueOrderinfoRepo;
@@ -50,6 +59,8 @@ public class IssueOrderExamineManageImpl extends AbstractCommManager implements
     private IssueOrderinfoExtRepo issueOrderinfoExtRepo;
     @Autowired
     private QtkBrandInfoRepo qtkBrandinfoRepo;
+    @Autowired
+    private QudaoCallbackResultRepo qudaoCallbackResultRepo;
 
     @Autowired
     private ApplicationContext applicationContext;
@@ -128,6 +139,7 @@ public class IssueOrderExamineManageImpl extends AbstractCommManager implements
         IssueOrderinfoExt ext = issueOrderinfoExtRepo.findByOrderNo(order.getOrderNo());
         ext.setAuditFailureCase(reqDto.getReason());
         issueOrderinfoExtRepo.merge(ext);
+        //不影响业务流程，全部异步执行
         //新增公告表
         String auditFailureCase = hasText(ext.getAuditReason()) ? ext.getAuditReason() : "";
         if (reqDto.getAuditStatus() && auditFailureCase.contains("申办车型未找到匹配范围")) {
@@ -136,22 +148,26 @@ public class IssueOrderExamineManageImpl extends AbstractCommManager implements
                 brandinfo.setVehicleType(order.getVehicleType());
                 String vehicleModel = extractFirstEnAlphabetNumberStr(ext.getVehicleModel());
                 brandinfo.setVehicleModel(vehicleModel);
-                brandinfo.setVin(ext.getVehicleVin().substring(0,8));
+                brandinfo.setVin(ext.getVehicleVin().substring(0, 8));
                 brandinfo.setCaculateStatus(1);
                 Integer vehicleClass = order.getVehicleClass();//车型
-                if (order.getVanType()==1){
+                if (order.getVanType() == 1) {
                     brandinfo.setPassengerChargeTypeMax(vehicleClass);
                     brandinfo.setPassengerChargeTypeMin(vehicleClass);
-                }else {
+                } else {
                     brandinfo.setVanChargeTypeMax(vehicleClass);
                     brandinfo.setVanChargeTypeMin(vehicleClass);
                 }
-                logger.info("车辆model {},车型{},vin {}",vehicleModel,vehicleClass,ext.getVehicleVin());
+                logger.info("车辆model {},车型{},vin {}", vehicleModel, vehicleClass, ext.getVehicleVin());
                 qtkBrandinfoRepo.persist(brandinfo);
             });
         }
-        //通知渠道 todo
-
+        //通知渠道
+        if (SourceType.CHANNEL.equals(order.getOrderSource())) {
+            executor.execute(() -> {
+                callBackQd(order, ext);
+            });
+        }
     }
 
 
@@ -168,4 +184,52 @@ public class IssueOrderExamineManageImpl extends AbstractCommManager implements
         return "";
     }
 
+    private void callBackQd(IssueOrderinfo order, IssueOrderinfoExt ext) {
+        //通知内容
+        CallbackModel callbackModel = new CallbackModel();
+        callbackModel.setOrderNo(order.getOrderNo())
+                .setOrderStep(order.getOrderStep().getCode())
+                .setOrderStatus(order.getOrderStatus().getCode())
+                .setMsg(ext.getAuditFailureCase())
+                .setCardId(order.getCardId())
+                .setObuId(order.getObuId())
+                .setPlateNum(order.getVehiclePlate())
+                .setPlateColor(order.getVehiclePlateColor());
+        //获取密钥
+        GetKeyRequest keyRequest = new GetKeyRequest();
+        keyRequest.setAgencyId(order.getAgencyId());
+        GetKeyResponse keyResponse = null;
+        try {
+            keyResponse = jsonPostRepeat(keyRequest);
+        } catch (Exception e) {
+            logger.error("通知渠道，获取密钥异常：{}", e.getMessage());
+            return;
+        }
+        //通知请求参数
+        AtsChannelNoticeRequest req = new AtsChannelNoticeRequest();
+        req.setCallbackModel(callbackModel);
+        req.setAppId(keyResponse.getAppId());
+        req.setKey(keyResponse.getKey());
+        req.setSingKey(keyResponse.getSingKey());
+        req.setUrl(order.getReturnUrl());
+
+        String exceMsg = "";//异常信息
+        AtsChannelNoticeResponse response = null;//响应体
+        try {
+            response = jsonPostRepeat(req);
+        } catch (Exception e) {
+            exceMsg = e.getMessage();
+            logger.error("通知渠道异常：{}", exceMsg);
+        }
+        //回调结果入库
+        QudaoCallbackResult quDaoCallBackResult = new QudaoCallbackResult();
+        quDaoCallBackResult.setOrderNo(order.getOrderNo());
+        quDaoCallBackResult.setReqUrl(order.getReturnUrl());
+        quDaoCallBackResult.setType(CallQuDaoType.ISSUES);
+        quDaoCallBackResult.setReqJson(callbackModel.toJson());
+        quDaoCallBackResult.setRespJson(response == null ? "" : response.toJson());
+        quDaoCallBackResult.setExceptionMsg(exceMsg);
+        qudaoCallbackResultRepo.persist(quDaoCallBackResult);
+    }
+
 }