Просмотр исходного кода

修改bug:
平台协议应收-应收订单,这块显示的信息有缺失,交强保费、车船税、商业保费、非车保费、交强入口比例、商业入口比例、非车入口比例、总应收金额。平台不需要分车险和非车

jiakai 4 месяцев назад
Родитель
Сommit
2e9541fb97

+ 5 - 0
commons/src/main/java/com/jzg/commons/entity/finance/po/InsPlyIncome.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.core.base.BaseModel;
+import com.jzg.commons.entity.po.InsFeeOrders;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -272,4 +273,8 @@ public class InsPlyIncome extends BaseModel {
     @Schema(description = "实际签单用户手机号")
     private String realQuoteUserName;
 
+    @TableField(exist = false)
+    @Schema(description = "订单费用表")
+    private InsFeeOrders insFeeOrders;
+
 }

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

@@ -54,7 +54,7 @@ public class InsFeeOrderController {
         return insFeeOrdersService.getInsFeeOrderAudit(userId);
     }
 
-    @GetMapping("/getInsFeeOrderByOrderNo")
+    @RequestMapping(value = "/getInsFeeOrderByOrderNo", method = {RequestMethod.GET, RequestMethod.POST})
     @Operation(summary = "订单费用列表通过订单号查询")
     public List<InsFeeOrders> getInsFeeOrderByOrderNo(String orderNo){
         return insFeeOrdersService.getInsFeeOrderByOrderNo(orderNo);

+ 24 - 0
tenant/organization/src/main/java/com/jzg/organization/client/InsFeeOrdersClient.java

@@ -0,0 +1,24 @@
+package com.jzg.organization.client;
+
+import com.jzg.commons.entity.po.InsFeeOrders;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * 订单费用接口
+ */
+@FeignClient(name = "jzg-insurance")
+public interface InsFeeOrdersClient {
+
+    /**
+     * 订单费用列表通过订单号查询
+     * @param orderNo
+     * @return
+     */
+    @PostMapping("/insFeeOrder/getInsFeeOrderByOrderNo")
+    List<InsFeeOrders> getInsFeeOrderByOrderNo(@RequestParam String orderNo);
+
+}

+ 8 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/ReceivableServiceImpl.java

@@ -20,6 +20,7 @@ import com.jzg.commons.entity.finance.po.*;
 import com.jzg.commons.entity.finance.vo.*;
 import com.jzg.commons.entity.orders.po.InsOrderAdjust;
 import com.jzg.commons.entity.po.EsmInsCompany;
+import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.po.PtlAgreement;
 import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.exception.SystemException;
@@ -29,6 +30,7 @@ import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.ServletUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.organization.client.EsmInsCompanyClient;
+import com.jzg.organization.client.InsFeeOrdersClient;
 import com.jzg.organization.excel.listener.JyExcelListener;
 import com.jzg.organization.excel.listener.OtherExcelListener;
 import com.jzg.organization.excel.listener.ReceivbleExcelListener;
@@ -109,6 +111,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
     @Autowired
     private SysUserJzgInfoSalesmanService sysUserJzgInfoSalesmanService;
 
+    @Autowired
+    private InsFeeOrdersClient insFeeOrdersClient;
+
     @Value("${upload.file.path}")
     private String uploadPath;
 
@@ -405,6 +410,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
                 String typeAttrName = Constant.ywyAttrTypeMap.get(typeAttr);
                 insPlyIncome.setTypeAttr(typeAttr);
                 insPlyIncome.setTypeAttrName(typeAttrName);
+                // 费用信息
+                List<InsFeeOrders> insFeeOrderByOrderNo = insFeeOrdersClient.getInsFeeOrderByOrderNo(insPlyIncome.getOrderNo());
+                insPlyIncome.setInsFeeOrders(CollUtil.getFirst(insFeeOrderByOrderNo));
             });
         }
         return records;