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