|
@@ -10,7 +10,9 @@ import com.ydtech.modules.base.controller.BaseController;
|
|
|
import com.ydtech.modules.ins.model.vo.KindInfoVo;
|
|
import com.ydtech.modules.ins.model.vo.KindInfoVo;
|
|
|
import com.ydtech.modules.ins.model.vo.RiskInfoVo;
|
|
import com.ydtech.modules.ins.model.vo.RiskInfoVo;
|
|
|
import com.ydtech.modules.order.entity.BasePageResult;
|
|
import com.ydtech.modules.order.entity.BasePageResult;
|
|
|
|
|
+import com.ydtech.modules.order.entity.InsOrders;
|
|
|
import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
|
|
import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
|
|
|
|
|
+import com.ydtech.modules.order.service.InsOrdersService;
|
|
|
import com.ydtech.modules.protocol.constants.DispatchTypeConstants;
|
|
import com.ydtech.modules.protocol.constants.DispatchTypeConstants;
|
|
|
import com.ydtech.modules.protocol.constants.TaxSourceStatusConstants;
|
|
import com.ydtech.modules.protocol.constants.TaxSourceStatusConstants;
|
|
|
import com.ydtech.modules.protocol.dao.PtlTaxSourceNewMapper;
|
|
import com.ydtech.modules.protocol.dao.PtlTaxSourceNewMapper;
|
|
@@ -78,6 +80,9 @@ public class PtlTaxSourceServiceImpl extends ServiceImpl<PtlTaxSourceNewMapper,
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private PtlTaxSourceNewRecordService ptlTaxSourceNewRecordService;
|
|
private PtlTaxSourceNewRecordService ptlTaxSourceNewRecordService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private InsOrdersService insOrdersService;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* @version
|
|
* @version
|
|
|
* @author: hxl
|
|
* @author: hxl
|
|
@@ -506,6 +511,9 @@ public class PtlTaxSourceServiceImpl extends ServiceImpl<PtlTaxSourceNewMapper,
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public String getAgreementId(String deptId, String userId, String companyId, BaseQuoteInfoVo quoteInfo, String riskCode,String orderno) {
|
|
public String getAgreementId(String deptId, String userId, String companyId, BaseQuoteInfoVo quoteInfo, String riskCode,String orderno) {
|
|
|
|
|
+ //通过订单号获取报价信息 防止从redis中获取的数据不对
|
|
|
|
|
+ InsOrders insOrders = insOrdersService.getById(orderno);
|
|
|
|
|
+ quoteInfo = new BaseQuoteInfoVo(insOrders);
|
|
|
List<PtlAgreementDispatchRulesAttr> dispatchRulesAttrList = ptlAgreementDispatchRulesAttrService.getDispatchRulesAttrList();
|
|
List<PtlAgreementDispatchRulesAttr> dispatchRulesAttrList = ptlAgreementDispatchRulesAttrService.getDispatchRulesAttrList();
|
|
|
String resultId = "";
|
|
String resultId = "";
|
|
|
//查找配置的默认项,匹配不到赋值默认的协议Id
|
|
//查找配置的默认项,匹配不到赋值默认的协议Id
|