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

Skip to content

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

admin 提交

parent 6f6f5c07
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 24 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java
View file @ 0f6443ba
......@@ -11,6 +11,7 @@ import com.liquidnet.service.kylin.dto.vo.express.KylinOrderExpressVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.liquidnet.service.merchant.constant.MerchantRedisConst;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
......@@ -455,4 +456,45 @@ public class DataUtils {
String redisKey = KylinRedisConst.KYLIN_EXPRESS_MODULES;
redisDataSourceUtil.getRedisKylinUtil().set(redisKey, voList);
}
/**
* 获取 票种快递票模板关联vo [第三方非线上]
*
* @param ticketId
* @return
*/
public KylinTicketExpressModuleVo getTEMMerchantVo(String ticketId) {
String redisKey = KylinRedisConst.TICKET_EXPRESS_MODULE_P.concat(ticketId);
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
if (obj != null) {
return (KylinTicketExpressModuleVo) obj;
} else {
return null;
}
}
/**
* 设置 票种快递票模板关联vo [线上]
*
* @param ticketId 票id
*/
public void setTEMVo(String ticketId, KylinTicketExpressModuleVo vo) {
redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.TICKET_EXPRESS_MODULE.concat(ticketId), vo);
}
/**
* 获取 票种快递票模板关联vo [线上]
*
* @param ticketId
* @return
*/
public KylinTicketExpressModuleVo getTEMVo(String ticketId) {
String redisKey = KylinRedisConst.TICKET_EXPRESS_MODULE.concat(ticketId);
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
if (obj != null) {
return (KylinTicketExpressModuleVo) obj;
} else {
return null;
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java
View file @ 0f6443ba
......@@ -205,6 +205,12 @@ public class PerformanceVoUtils {
TicketTimesTicketCreatePartnerVo ticketTimesTicketCreatePartnerVo = new TicketTimesTicketCreatePartnerVo();
BeanUtils.copyProperties(ticketTimes, ticketTimesTicketCreatePartnerVo);
List<KylinTicketPartnerVo> kylinTicketPartnerVos = getTicketMongoList(ticketTimes.getTicketTimesId());
for (KylinTicketPartnerVo item :
kylinTicketPartnerVos) {
if (item.getIsExpress() == 1) {
item.setExpressModuleList(dataUtils.getTEMMerchantVo(item.getTicketsId()).getProduceCodeList());
}
}
ticketTimesTicketCreatePartnerVo.setTicket(kylinTicketPartnerVos);
ticketTimesTicketCreatePartnerVoList.add(ticketTimesTicketCreatePartnerVo);
for (KylinTicketPartnerVo kylinTicketPartnerVoItem : kylinTicketPartnerVos) {
......@@ -222,7 +228,7 @@ public class PerformanceVoUtils {
kylinPerformanceMisVo.setStopSellTime(StringList.get(0));
kylinPerformanceMisVo.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
String descibes = kylinPerformanceMisVo.getDetails().replace("'","");
String descibes = kylinPerformanceMisVo.getDetails().replace("'", "");
kylinPerformanceMisVo.setDetails(descibes);
kylinPerformanceMisVo.setIsDistribution(0);
kylinPerformanceMisVo.setSyncAgent(0);
......@@ -250,7 +256,7 @@ public class PerformanceVoUtils {
KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
BeanUtils.copyProperties(performanceUpdateMisVo, performanceRelations);
MerchantFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(performanceRelations.getFieldId());
MerchantFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(performanceRelations.getFieldId());
performances.setDetails(performanceUpdateMisVo.getDetails());
performances.setCityName(fieldsVo.getCityName());
performances.setCityId(Integer.parseInt(fieldsVo.getCityId()));
......@@ -275,9 +281,9 @@ public class PerformanceVoUtils {
performanceRelations.setUpdatedAt(updatedAt);
performanceRelations.setMerchantId(null);
if(performances.getApprovalUrl()==null || performances.getApprovalUrl().equals("")){
if (performances.getApprovalUrl() == null || performances.getApprovalUrl().equals("")) {
performanceStatus.setStatusSell(0);
}else{
} else {
performanceStatus.setStatusSell(1);
}
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinPerformancesPartnerServiceImpl.java
View file @ 0f6443ba
......@@ -179,7 +179,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
if(!data.getMerchantId().equals(merchantId)){
if (!data.getMerchantId().equals(merchantId)) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
}
......@@ -205,7 +205,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
if (!mongoMerchantUtils.judgeIsPermission(step2Param.getPerformancesId(), step2Param.getMerchantId(), new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
if(!vo.getMerchantId().equals(step2Param.getMerchantId())){
if (!vo.getMerchantId().equals(step2Param.getMerchantId())) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
}
......@@ -414,12 +414,14 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
});
//快递相关
KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMMerchantVo(ticketItem.getTicketsId());
redisMerchantUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo);
sqlsDataE.add(new Object[]{ticketItem.getTicketsId()});
for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())
sqlsDataF.add(new Object[]{
ticketItem.getTicketsId(), mVo.getProductCode(), now, now
});
if (moduleVo != null) {
redisMerchantUtils.setTEMVo(ticketItem.getTicketsId(), moduleVo);
sqlsDataE.add(new Object[]{ticketItem.getTicketsId()});
for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())
sqlsDataF.add(new Object[]{
ticketItem.getTicketsId(), mVo.getProductCode(), now, now
});
}
}
}
String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE, sqlsDataF);
......@@ -449,10 +451,10 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
if (data == null) {
return ResponseDto.failure(ErrorMapping.get(20104));
}
if (!mongoMerchantUtils.judgeIsPermission(performancesId,merchantId, new String[]{
if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
if(!data.getMerchantId().equals(merchantId)){
if (!data.getMerchantId().equals(merchantId)) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
}
......@@ -492,7 +494,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.LINE.getId(),
})) {
if(!vo.getMerchantId().equals(merchantId)){
if (!vo.getMerchantId().equals(merchantId)) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
}
......@@ -545,7 +547,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.LINE.getId(),
})) {
if(!vo.getMerchantId().equals(merchantId)){
if (!vo.getMerchantId().equals(merchantId)) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
}
......@@ -683,7 +685,7 @@ public class KylinPerformancesPartnerServiceImpl implements IKylinPerformancesPa
if (!mongoMerchantUtils.judgeIsPermission(performancesId, merchantId, new String[]{
MerchantAuthorizationConst.PerformancePermission.EDIT.getId(),
})) {
if(!vo.getMerchantId().equals(merchantId)){
if (!vo.getMerchantId().equals(merchantId)) {
return ResponseDto.failure(ErrorMapping.get(29999));
}
}
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/service/impl/KylinTicketsPartnerServiceImpl.java
View file @ 0f6443ba
......@@ -337,7 +337,9 @@ public class KylinTicketsPartnerServiceImpl implements IKylinTicketsPartnerServi
@Override
public KylinTicketPartnerVo getTicketsMongo(String ticketsId) {
KylinTicketPartnerVo vo = mongoMerchantUtils.getTicketsMongo(ticketsId);
vo.setExpressModuleList(redisMerchantUtils.getTEMMerchantVo(ticketsId).getProduceCodeList());
if(vo.getIsExpress()==1) {
vo.setExpressModuleList(redisMerchantUtils.getTEMMerchantVo(ticketsId).getProduceCodeList());
}
return mongoMerchantUtils.getTicketsMongo(ticketsId);
}
......
liquidnet-bus-service/liquidnet-service-merchant/liquidnet-service-merchant-impl/src/main/java/com/liquidnet/service/merchant/util/PerformanceUtils.java
View file @ 0f6443ba
......@@ -392,12 +392,14 @@ public class PerformanceUtils {
//快递相关
KylinTicketExpressModuleVo moduleVo = redisMerchantUtils.getTEMMerchantVo(tickets.getTicketsId());
redisMerchantUtils.setTEMMerchantVo(tickets.getTicketsId(), moduleVo);
del9.add(new Object[]{tickets.getTicketsId(), updatedAt});
for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())
insert9.add(new Object[]{
tickets.getTicketsId(), mVo.getProductCode(), updatedAt, updatedAt
});
if(moduleVo!=null) {
redisMerchantUtils.setTEMMerchantVo(tickets.getTicketsId(), moduleVo);
del9.add(new Object[]{tickets.getTicketsId(), updatedAt});
for (ExpressModuleVo mVo : moduleVo.getProduceCodeList())
insert9.add(new Object[]{
tickets.getTicketsId(), mVo.getProductCode(), updatedAt, updatedAt
});
}
}
}
String sqlData = SqlMapping.gets(sqls,
......
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