记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 9eee56d7 authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

merchant 快递修改

parent f5096cd7
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinTicketsPartnerServiceImpl.java
View file @ 9eee56d7
...@@ -294,8 +294,9 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi ...@@ -294,8 +294,9 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
String ticketsIdNew = IDGenerator.nextSnowId(); String ticketsIdNew = IDGenerator.nextSnowId();
KylinTicketPartnerVo kylinTicketPartnerVo = mongoMerchantUtils.getTicketPartnerVo(ticketsId); KylinTicketPartnerVo kylinTicketPartnerVo = mongoMerchantUtils.getTicketPartnerVo(ticketsId);
//快递类型判断 //快递类型判断
KylinTicketExpressModuleVo vo = null;
if (kylinTicketPartnerVo.getIsExpress() == 1) { if (kylinTicketPartnerVo.getIsExpress() == 1) {
KylinTicketExpressModuleVo vo = redisMerchantUtils.getTEMMerchantVo(kylinTicketPartnerVo.getTicketsId()); vo = redisMerchantUtils.getTEMMerchantVo(kylinTicketPartnerVo.getTicketsId());
vo.setTicketId(ticketsIdNew); vo.setTicketId(ticketsIdNew);
redisMerchantUtils.setTEMMerchantVo(ticketsIdNew, vo); redisMerchantUtils.setTEMMerchantVo(ticketsIdNew, vo);
} }
...@@ -304,6 +305,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi ...@@ -304,6 +305,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
kylinTicketPartnerVo.setTicketsId(ticketsIdNew); kylinTicketPartnerVo.setTicketsId(ticketsIdNew);
KylinTicketPartnerVo data = mongoMerchantUtils.insertTicketPartnerVo(kylinTicketPartnerVo); KylinTicketPartnerVo data = mongoMerchantUtils.insertTicketPartnerVo(kylinTicketPartnerVo);
kylinTicketPartnerVo.setExpressModuleList(vo == null ? null : vo.getProduceCodeList());
log.info(UserPathDto.setPartnerData("0", "deleteTicket", "performanceId=" + performanceId + ",ticketsId=" + ticketsId, kylinTicketPartnerVo)); log.info(UserPathDto.setPartnerData("0", "deleteTicket", "performanceId=" + performanceId + ",ticketsId=" + ticketsId, kylinTicketPartnerVo));
return ResponseDto.success(kylinTicketPartnerVo); return ResponseDto.success(kylinTicketPartnerVo);
} catch (Exception e) { } catch (Exception e) {
...@@ -337,7 +339,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi ...@@ -337,7 +339,7 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
@Override @Override
public KylinTicketPartnerVo getTicketsMongo(String ticketsId) { public KylinTicketPartnerVo getTicketsMongo(String ticketsId) {
KylinTicketPartnerVo vo = mongoMerchantUtils.getTicketsMongo(ticketsId); KylinTicketPartnerVo vo = mongoMerchantUtils.getTicketsMongo(ticketsId);
if(vo.getIsExpress()==1) { if (vo.getIsExpress() == 1) {
vo.setExpressModuleList(redisMerchantUtils.getTEMMerchantVo(ticketsId).getProduceCodeList()); vo.setExpressModuleList(redisMerchantUtils.getTEMMerchantVo(ticketsId).getProduceCodeList());
} }
return mongoMerchantUtils.getTicketsMongo(ticketsId); return mongoMerchantUtils.getTicketsMongo(ticketsId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment