|
|
@@ -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();
|
|
|
|