Browse Source

报价时插入到ins_orders表中的数据新增为systemcode赋值的操作

lipf 4 months ago
parent
commit
bdbc7cf82a

+ 2 - 2
commons/src/main/java/com/jzg/commons/entity/dto/FeeAuditParam.java

@@ -42,11 +42,11 @@ public class FeeAuditParam extends PageRequest {
 
     @Schema(description = "报价时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime quotationTimeStart;
+    private LocalDate quotationTimeStart;
 
     @Schema(description = "报价时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDateTime quotationTimeEnd;
+    private LocalDate quotationTimeEnd;
 
     @Schema(description = "签单时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")

+ 3 - 3
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -236,11 +236,11 @@ public class UnifyOrderManager {
     @PostMapping("/quote")
     @QuoteVerification
     public HttpResult<QuoteResultsVo> quote(@RequestBody QuoteVo quoteVo) throws Exception {
-        log.info("进行车险报价:quoteVo=[{}]", JSONUtil.toJsonStr(quoteVo));
+        String systemCode = getSystemCode();
+        log.info("进行车险报价:systemCode=[{}],quoteVo=[{}]",systemCode, JSONUtil.toJsonStr(quoteVo));
         HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(quoteVo.getOrder().getInsuranceCompanyCode());
         log.info("车险报价:esmInsCompanyHttpResult=[{}]", JSONUtil.toJsonStr(esmInsCompanyHttpResult));
         AssertionUtils.isFail(esmInsCompanyHttpResult.getCode() != 200, esmInsCompanyHttpResult.getMsg());
-        String systemCode = getSystemCode();
         String companyName = CompanyConstants.getCompanyNameByCode(esmInsCompanyHttpResult.getData().getCompanyCode());
 
         log.info("查询保司配置的协议:systemCode=[{}],companyId=[{}]", systemCode, esmInsCompanyHttpResult.getData().getId());
@@ -267,7 +267,7 @@ public class UnifyOrderManager {
                 .getApiType(), sysQuoteConfigService, sysQuoteRedisService, platformClient, baseController);
 
         // 生成主订单及子订单  返回子订单id
-        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName);
+        String ordersNo = insOrdersService.generateOrders(quoteVo, companyName,systemCode);
 
         // 添加车辆没有的参数: 车辆明细、
         QuoteInfoParameterFilling.setParameterSettings(quoteVo, esmInsCompanyHttpResult.getData().getCompanyCode());

+ 3 - 2
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersService.java

@@ -57,11 +57,12 @@ public interface InsOrdersService extends IService<InsOrders> {
     /**
      * 根据报价参数生成订单  返回订单号
      *
-     * @param quoteVo 报价信息
+     * @param quoteVo     报价信息
      * @param companyName 保险公司名称
+     * @param systemCode 租户代码
      * @return String
      */
-    String generateOrders(QuoteVo quoteVo, String companyName);
+    String generateOrders(QuoteVo quoteVo, String companyName, String systemCode);
 
 
     /**

+ 3 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -387,7 +387,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
     @Override
     public void verifyOrder(VerifyOrderParam param) {
-        log.info("审核订单. param=[{}]", JSONUtil.toJsonStr(param));
+        String systemCode = baseController.getSystemCode();
+        log.info("审核订单.systemCode=[{}], param=[{}]",systemCode, JSONUtil.toJsonStr(param));
         InsFeeAudit audit = this.getById(param.getOrderNo());
         if(audit == null){
             throw new ServiceException("要审核的订单不存在");
@@ -537,6 +538,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 userAccount.setUserId(sysUserResult.getData().getId());
                 userAccount.setSumAmount(feeOrders.getTotalReceivablePremium());
                 userAccount.setSumAmountUnpaid(feeOrders.getTotalReceivablePremium());
+                userAccount.setSystemCode(systemCode);
             }else{
                 userAccount.setSumAmount(feeOrders.getTotalReceivablePremium().add(userAccount.getSumAmount()));
                 userAccount.setSumAmountUnpaid(feeOrders.getTotalReceivablePremium().add(userAccount.getSumAmount()));

+ 7 - 5
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -978,11 +978,11 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      */
     @Override
     @Transactional
-    public String generateOrders(QuoteVo quoteVo, String companyName) {
+    public String generateOrders(QuoteVo quoteVo, String companyName, String systemCode) {
         // 生成订单的条件
         // 1个保险公司只有一个主订单   不区分险种
         // 唯一性的判定标准:保险公司编号+ 车牌号 + 车架号
-        log.info("生成一个主订单和多个子订单:quoteVo=[{}],companyName=[{}]", JSONUtil.toJsonStr(quoteVo), companyName);
+        log.info("生成一个主订单和多个子订单:systemCode=[{}], quoteVo=[{}],companyName=[{}]",systemCode, JSONUtil.toJsonStr(quoteVo), companyName);
         InsOrders mainOrders = this.getMainOrders(
                 quoteVo.getOrder().getInsuranceCompanyCode(),
                 quoteVo.getCarInfoVo().getLicenseNo(),
@@ -995,13 +995,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 如果订单号为0 则生成主订单
         if (!isExistsMainOrder) {
             // 生成主订单
-            mainOrderNo = this.saveBaseOrderorSubOrder(quoteVo, companyName, "0");
+            mainOrderNo = this.saveBaseOrderorSubOrder(quoteVo, companyName, "0",systemCode);
         } else {
             // 更新主订单
             mainOrderNo = this.updateMainOrders(quoteVo, mainOrders.getId(), companyName);
         }
         // 生成子订单
-        return this.saveBaseOrderorSubOrder(quoteVo, companyName, mainOrderNo);
+        return this.saveBaseOrderorSubOrder(quoteVo, companyName, mainOrderNo,systemCode );
     }
 
 
@@ -1011,11 +1011,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
      * @param quoteVo
      * @param companyName
      * @param mainOrderNo 主订单号
+     * @param systemCode
      * @return
      */
-    private String saveBaseOrderorSubOrder(QuoteVo quoteVo, String companyName, String mainOrderNo) {
+    private String saveBaseOrderorSubOrder(QuoteVo quoteVo, String companyName, String mainOrderNo, String systemCode) {
         // 保存主订单信息
         InsOrders insOrders = new InsOrders();
+        insOrders.setSystemCode(systemCode);
         // 生成主订单编号
         if ("0".equals(mainOrderNo)) {
             insOrders.setParentId("0");

File diff suppressed because it is too large
+ 0 - 0
tenant/insurance/quotation-zijin/src/main/resources/js/tsssss.js


Some files were not shown because too many files changed in this diff