Parcourir la source

设置为疑问订单添加到订单轨迹中

lipf il y a 2 mois
Parent
commit
d44794251f

+ 15 - 0
commons/src/main/java/com/jzg/commons/entity/vo/QuestionOrder.java

@@ -0,0 +1,15 @@
+package com.jzg.commons.entity.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "疑问订单")
+@Data
+public class QuestionOrder {
+
+    // 订单号
+    private String orderNo;
+
+    // 疑问订单
+    private String problemReason;
+}

+ 1 - 0
commons/src/main/java/com/jzg/quotation/summary/constants/QuoteNumberConstant.java

@@ -95,6 +95,7 @@ public class QuoteNumberConstant {
         OPT_TYPE_14(14,"订单审核"),
         OPT_TYPE_14(14,"订单审核"),
         OPT_TYPE_15(15,"费用调整"),
         OPT_TYPE_15(15,"费用调整"),
         OPT_TYPE_16(16,"批量修改比例"),
         OPT_TYPE_16(16,"批量修改比例"),
+        OPT_TYPE_17(17,"设置为疑问订单"),
         ;
         ;
         private Integer code;
         private Integer code;
         private String desc;
         private String desc;

+ 38 - 0
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/OrderOperationLogAspect.java

@@ -15,6 +15,7 @@ import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
 import com.jzg.commons.entity.vo.AdjustAllRefundVo;
 import com.jzg.commons.entity.vo.AdjustAllRefundVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
+import com.jzg.commons.entity.vo.QuestionOrder;
 import com.jzg.quotation.commons.constant.SpElMapping;
 import com.jzg.quotation.commons.constant.SpElMapping;
 import com.jzg.quotation.commons.utils.SpElFieldExtractor;
 import com.jzg.quotation.commons.utils.SpElFieldExtractor;
 import com.jzg.quotation.summary.aop.aspect.OrderOperationLog;
 import com.jzg.quotation.summary.aop.aspect.OrderOperationLog;
@@ -171,10 +172,47 @@ public class OrderOperationLogAspect {
                 result = joinPoint.proceed();
                 result = joinPoint.proceed();
                 this.batchModify(result,log, batchModifyVo);
                 this.batchModify(result,log, batchModifyVo);
                 break;
                 break;
+            // 设为疑问订单
+            case 17:
+                logger.info("设置为疑问订单.log.orderSpEl()=[{}]",log.orderSpEl());
+                QuestionOrder questionOrder = parser.parseExpression(log.orderSpEl()).getValue(context, QuestionOrder.class);
+                result = joinPoint.proceed();
+                this.updateToQuestionOrder(result,log, questionOrder);
+                break;
         }
         }
         return result;
         return result;
     }
     }
 
 
+    /**
+     * 设置为疑问订单
+     *
+     * @author lipf
+     * @date 2026/7/16 16:35
+     */
+    private void updateToQuestionOrder(Object result, OrderOperationLog log, QuestionOrder questionOrder) {
+        logger.info("设置为疑问订单。questionOrder=[{}]", JSONUtil.toJsonStr(questionOrder));
+        InsOrdersTrack track = new InsOrdersTrack();
+        track.setModule(log.module());
+        track.setSubModule(log.subModule());
+        track.setOptType(log.optType().getCode());
+        track.setOptContent(log.description());
+        track.setChangeAfter(JSONUtil.toJsonStr(questionOrder));
+        track.setResult(JSONUtil.toJsonStr(result));
+        InsOrders insOrders = orderService.getById(questionOrder.getOrderNo());
+        if(insOrders != null){
+            InsOrdersCarInfo carInfo = carInfoService.getByOrderId(insOrders.getId());
+            track.setLicenseNo(carInfo.getLicenseNo());
+            track.setCompanyId(insOrders.getCompanyId());
+            // track.setResult(result.getMsg());
+        }else{
+            track.setResult("要设置位疑问订单的订单不存在");
+        }
+        track.setStatus(1);
+        track.setOrderNo(questionOrder.getOrderNo());
+        traceService.save(track);
+
+    }
+
     /**
     /**
      * 批量修改比例
      * 批量修改比例
      *
      *

+ 12 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsFeeAuditController.java

@@ -12,6 +12,7 @@ import com.jzg.commons.entity.orders.vo.AuditCostInfoVo;
 import com.jzg.commons.entity.orders.vo.FeeAuditVo;
 import com.jzg.commons.entity.orders.vo.FeeAuditVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
 import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
 import com.jzg.commons.entity.vo.PtlAgreementCostRatioVo;
+import com.jzg.commons.entity.vo.QuestionOrder;
 import com.jzg.quotation.summary.aop.aspect.OrderOperationLog;
 import com.jzg.quotation.summary.aop.aspect.OrderOperationLog;
 import com.jzg.quotation.summary.constants.QuoteNumberConstant;
 import com.jzg.quotation.summary.constants.QuoteNumberConstant;
 import com.jzg.quotation.summary.service.InsFeeAuditService;
 import com.jzg.quotation.summary.service.InsFeeAuditService;
@@ -150,9 +151,19 @@ public class InsFeeAuditController {
      *
      *
      * @return HttpResult<String> 设为疑问单的处理结果
      * @return HttpResult<String> 设为疑问单的处理结果
      */
      */
+    @OrderOperationLog(
+            module = "订单审核",
+            subModule = "设为疑问订单",
+            optType = QuoteNumberConstant.QuoteOptType.OPT_TYPE_17,
+            description = "设置为疑问订单",
+            orderSpEl = "#questionOrder",
+            feedbackSpEl = "#ret.code + ' - ' + #ret.msg+ ' - ' + #ret.data"
+    )
     @PostMapping("/updateToQuestionOrder")
     @PostMapping("/updateToQuestionOrder")
     @Operation(summary = "设置为疑问订单")
     @Operation(summary = "设置为疑问订单")
-    public HttpResult<String> updateToQuestionOrder(@RequestParam("orderNo") String orderNo,@RequestParam(value = "problemReason",required = false) String problemReason){
+    public HttpResult<String> updateToQuestionOrder(@RequestBody QuestionOrder questionOrder){
+        String orderNo = questionOrder.getOrderNo();
+        String problemReason = questionOrder.getProblemReason();
         insFeeAuditService.updateToQuestionOrder(orderNo,"1", problemReason);
         insFeeAuditService.updateToQuestionOrder(orderNo,"1", problemReason);
         return HttpResult.ok("已设为疑问订单,可前往疑问订单列表查看");
         return HttpResult.ok("已设为疑问订单,可前往疑问订单列表查看");
     }
     }