Преглед изворни кода

bugfix:补录订单-订单管理-订单号点进来啥信息也不显示

lipf пре 4 месеци
родитељ
комит
ecfabe51f7

+ 3 - 1
partner/src/main/java/com/jzg/controller/PartnerRuleController.java

@@ -39,7 +39,9 @@ public class PartnerRuleController {
 
     /**
      * 获取等级规则名称
-     * @return
+     *
+     * @author lipf
+     * @date 2026/4/14 15:51
      */
     @GetMapping("/queryGradeName")
     public HttpResult queryGradeName() {

+ 10 - 9
partner/src/main/java/com/jzg/service/Impl/PartnerRuleServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.exception.SystemException;
@@ -19,6 +20,8 @@ import com.jzg.mapper.PartnerUserMapper;
 import com.jzg.service.PartnerRuleService;
 import com.jzg.utils.ExpiredCommissionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +41,7 @@ import java.util.Objects;
 @Service
 public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, PartnerRule> implements PartnerRuleService {
 
+    private static final Logger log = LoggerFactory.getLogger(PartnerRuleServiceImpl.class);
 
     @Autowired
     private PartnerAttributeMapper attributeMapper;
@@ -99,7 +103,7 @@ public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, Partn
                 num ++;
             }
         }catch (Exception e){
-            e.printStackTrace();
+            log.error("com.jzg.service.Impl.PartnerRuleServiceImpl.save。 ",e);
             throw new RuntimeException("保存失败");
         }
         return num;
@@ -117,7 +121,9 @@ public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, Partn
 
     @Override
     public  List<Map<String,String>>  queryGradeName() {
-        return attributeMapper.queryGradeName();
+        List<Map<String, String>> maps = attributeMapper.queryGradeName();
+        log.debug("查询出的合伙人等级信息是:[{}]", JSONUtil.toJsonStr(maps));
+        return maps;
     }
 
     private PartnerRuleEntity validateGradeAndFetchRuleEntity(String grade) {
@@ -263,6 +269,7 @@ public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, Partn
         try {
             PartnerRuleEntity partnerRuleEntity = validateGradeAndFetchRuleEntity(grade);
             if (partnerRuleEntity == null) {
+                log.info("合作伙伴规则实体不能为空. grade=[{}]",grade);
                 throw new SystemException("合作伙伴规则实体不能为空");
             }
             partnerRuleEntity.getStrategyArray();
@@ -280,8 +287,7 @@ public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, Partn
             }
             return new VerifyData(partnerRuleEntity, p, bf,ownBf);
         }catch (Exception e){
-            e.printStackTrace();
-            log.error("用户ID:{}" + userId + "报错信息:{}" + e.getMessage());
+            log.error("用户ID:{}",userId, e);
             throw new SystemException(e.getMessage());
         }
     }
@@ -427,11 +433,6 @@ public class PartnerRuleServiceImpl extends ServiceImpl<PartnerRuleMapper, Partn
     }
 
 
-
-
-
-
-
 }
 
 

+ 6 - 0
partner/src/main/java/com/jzg/service/PartnerRuleService.java

@@ -16,6 +16,12 @@ public interface PartnerRuleService {
 
     List<PartnerRuleEntity> queryAll();
 
+    /**
+     * 获取等级规则名称
+     *
+     * @author lipf
+     * @date 2026/4/14 15:51
+     */
     List<Map<String,String>>  queryGradeName();
 
 

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

@@ -8,7 +8,6 @@ import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.dto.InsOrdersParamVO;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import com.jzg.commons.entity.quote.vo.KindInfoVo;
@@ -22,7 +21,6 @@ import com.jzg.quotation.summary.mapper.InsOrdersMapper;
 import com.jzg.quotation.summary.service.InsFeeOrdersService;
 import com.jzg.quotation.summary.service.InsOrdersCarInfoService;
 import com.jzg.quotation.summary.service.InsOrdersService;
-import com.jzg.quotation.summary.service.InsTaskImagesService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
@@ -48,9 +46,6 @@ public class InsOrdersController extends BaseController {
     @Resource
     private InsOrdersService insOrdersService;
 
-    @Resource
-    private InsTaskImagesService insTaskImagesService;
-
     @Autowired
     private InsOrdersCarInfoService insOrdersCarInfoService;
 
@@ -83,8 +78,8 @@ public class InsOrdersController extends BaseController {
     }
 
     @GetMapping("selectById")
-    @Operation(summary = "通过ID查询")
-    public HttpResult selectById(@NotNull(message = "id不能为空") @RequestParam("id") Long id) {
+    @Operation(summary = "通过ID查询订单信息")
+    public HttpResult<InsOrdersVo> selectById(@NotNull(message = "id不能为空") @RequestParam("id") Long id) {
         return HttpResult.ok(insOrdersService.selectById(id));
     }
 
@@ -201,7 +196,7 @@ public class InsOrdersController extends BaseController {
                 if(collect.isEmpty()){
                     jsonObject.put(kingCode,"-");
                 }else{
-                    String amount = "";
+                    String amount;
                     if (Integer.parseInt(collect.get(0).getAmount()) >= 10000){
                         amount = (Integer.parseInt(collect.get(0).getAmount()) / 10000) + "万";
                     }else{

+ 6 - 1
tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersService.java

@@ -3,7 +3,6 @@ package com.jzg.quotation.summary.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.dto.InsOrdersParamVO;
@@ -41,6 +40,12 @@ public interface InsOrdersService extends IService<InsOrders> {
     InsOrdersVo queryById(Long id);
 
 
+    /**
+     * 根据id查询订单信息
+     *
+     * @author lipf
+     * @date 2026/4/14 16:51
+     */
     InsOrdersVo selectById(Long id);
 
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -58,6 +59,8 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 import org.apache.commons.beanutils.BeanUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -79,6 +82,7 @@ import java.util.stream.Collectors;
 @Service
 public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders> implements InsOrdersService {
 
+    private static final Logger log = LoggerFactory.getLogger(InsOrdersServiceImpl.class);
 
     private final InsOrdersOtherService insOrdersOtherService;
 
@@ -169,7 +173,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             // 插入订单信息,如果插入失败,则返回错误信息
             int insertResult = insOrdersMapper.insert(insOrders);
             if (insertResult <= 0) {
-                log.error("订单插入失败,订单信息: {}");
+                log.error("订单插入失败,订单信息: {}", JSONUtil.toJsonStr(insOrders));
                 return HttpResult.error("保存订单失败");
             }
             String quoteNo = insOrders.getId();
@@ -389,19 +393,30 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         return insOrdersVo;
     }
 
+    /**
+     * 根据id查询订单信息
+     *
+     * @author lipf
+     * @date 2026/4/14 16:51
+     */
     @Override
     public InsOrdersVo selectById(Long id) {
+        log.info("根据id查询订单信息。订单的序号(不是订单号)id=[{}]",id);
         // 1. 查询订单信息
         InsOrdersVo insOrdersVo = insOrdersMapper.getById(id);
         if (insOrdersVo == null) {
+            log.info("根据id没有找到订单信息。订单的序号(不是订单号)id=[{}]。",id);
             throw new SystemException("查询结果为空,无法处理订单信息");
         }
         // 协议名称、协议类型
         if (Objects.nonNull(insOrdersVo.getInsOrders().getAgreementId())) {
             HttpResult<AgreementInfoVo> ptlAgreement = orgClient.queryAgreementById(insOrdersVo.getInsOrders().getAgreementId());
-            AssertionUtils.isFail(ptlAgreement.getCode() == 500, ptlAgreement.getMsg() + ",请联系管理处理");
-            insOrdersVo.setAgreementType(ptlAgreement.getData().getAgreement().getAgreementType());
-            insOrdersVo.setAgreementName(ptlAgreement.getData().getAgreement().getAgreementName());
+            // modify by lipf 2026年4月14日16:59:27 解决查看后补订单没有协议时查看不到数据的bug
+            //AssertionUtils.isFail(ptlAgreement.getCode() == 500, ptlAgreement.getMsg() + ",请联系管理处理");
+            if(ptlAgreement.getData() != null && ptlAgreement.getData().getAgreement() != null){
+                insOrdersVo.setAgreementType(ptlAgreement.getData().getAgreement().getAgreementType());
+                insOrdersVo.setAgreementName(ptlAgreement.getData().getAgreement().getAgreementName());
+            }
         }
 
         // 业务员信息
@@ -1152,11 +1167,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         return baseController.getUserSystemCode();
     }
 
-    @Override
     /**
      * 获取历史报价信息
-     * @return
+     *
+     * @return List<HistoryQuoteResultVo>
      */
+    @Override
     public List<HistoryQuoteResultVo> getHistoryQuote() {
         String userName = baseController.getUserName();