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

Skip to content

L
liquidnet-bus-v1
Commit b2d54abf authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 96201789 7e6889a9
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 23 deletions
liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/impl/PayChannelStrategyAlipayImpl.java
View file @ b2d54abf
......@@ -97,6 +97,7 @@ public class PayChannelStrategyAlipayImpl extends AbstractPayChannelStrategyImpl
//退款
if(notifyMap.containsKey("refund_fee") || notifyMap.containsKey("gmt_refund") || notifyMap.containsKey("out_biz_no")) {
returnStr = dragonOrderRefundsService.aliPayRefundCallBack(JSON.toJSONString(notifyMap));
return returnStr;
}
// 根据银行订单号获取支付信息
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ b2d54abf
......@@ -124,14 +124,12 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
// checkOrderTime(uid);
KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
currentTime = System.currentTimeMillis() - currentTime;
log.debug("获取订单详情 -> time:" + (currentTime) + "毫秒");
if (!orderTicketVo.getUserId().equals(uid)) {
return null;
}
if (null != orderTicketVo) {
KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
currentTime = System.currentTimeMillis() - currentTime;
log.debug("获取演出详情 -> time:" + (currentTime) + "毫秒");
List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
KylinTicketVo ticketVo = null;
......@@ -147,7 +145,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
}
currentTime = System.currentTimeMillis() - currentTime;
log.debug("巡演票数据 -> time:" + (currentTime) + "毫秒");
orderTicketVo.setIsTrueName(ticketVo.getIsTrueName());
orderTicketVo.setNoticeImage(performanceVo.getNoticeImage());
......@@ -168,7 +165,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
orderTicketVo.setQrCode("");
}
currentTime = System.currentTimeMillis() - currentTime;
log.debug("获取二维码 -> time:" + (currentTime) + "毫秒");
// 数据脱敏
for (KylinOrderTicketEntitiesVo item : kylinOrderTicketEntitiesVoList) {
......@@ -180,7 +176,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
}
}
currentTime = System.currentTimeMillis() - currentTime;
log.debug("入场人加密 -> time:" + (currentTime) + "毫秒");
//计算 倒计时
Date nowDate = DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss");
if (orderTicketVo.getStatus().equals(KylinTableStatusConst.ORDER_STATUS0)) {
......@@ -195,7 +190,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
vo.setRestTime(0L);
}
currentTime = System.currentTimeMillis() - currentTime;
log.debug("获取倒计时 -> time:" + (currentTime) + "毫秒");
Integer orderExpressStatus = dataUtils.getOrderExpressInfo(orderTicketVo.getOrderTicketsId());
vo.setExpressStatus(orderExpressStatus);
......@@ -207,7 +201,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
break;
}
OrderRefundListVo data = OrderRefundListVo.getNew();
data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
if(item.getOrderRefundCode().length()>20) {
data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
}
data.setOrderRefundsId(item.getOrderRefundsId());
data.setStatus(item.getStatus());
data.setPrice(item.getPrice());
......@@ -231,19 +227,18 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
} else {
vo.setIsCanRefund(0);
}
currentTime = System.currentTimeMillis() - currentTime;
log.debug("是否支持退款 -> time:" + (currentTime) + "毫秒");
currentTime = System.currentTimeMillis() - currentTime;
log.debug("循环退款详情 -> time:" + (currentTime) + "毫秒");
orderTicketVo.setOrderRefundListVos(orderRefundListVos);
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
if(orderTicketVo.getOrderCode().length()>20) {
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
}
vo.setOrderTicketVo(orderTicketVo);
vo.setEnterDescribe(dataUtils.getEnterInfo(performanceVo.getType(), orderTicketVo.getGetTicketType(), orderTicketVo.getIsStudent(), ticketVo.getIsTrueName()));
}
log.info(UserPathDto.setData("订单详情", orderId, vo));
return vo;
} catch (Exception e) {
log.info("订单详情异常:",e);
return null;
}
}
......@@ -300,8 +295,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
kylinOrderTicketEntitiesPreRefundVos.add(refundVo);
}
orderTicketVo.setFieldName(performanceVo.getFieldName());
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
if(orderTicketVo.getOrderCode().length()>20) {
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
}
BeanUtils.copyProperties(orderTicketVo, vo);
vo.setIsTrueName(performanceVo.getIsTrueName());
vo.setEntitiesPreRefundVos(kylinOrderTicketEntitiesPreRefundVos);
......@@ -324,9 +320,13 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return ResponseDto.failure(ErrorMapping.get("20003"));
}
orderTicketVo.setFieldName(performanceVo.getFieldName());
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
if(orderTicketVo.getOrderCode().length()>20) {
orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
}
KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
kylinOrderRefundsVoBase.setOrderRefundCode(kylinOrderRefundsVoBase.getOrderRefundCode().substring(kylinOrderRefundsVoBase.getOrderRefundCode().length() - 10));
if(kylinOrderRefundsVoBase.getOrderRefundCode().length()>20) {
kylinOrderRefundsVoBase.setOrderRefundCode(kylinOrderRefundsVoBase.getOrderRefundCode().substring(kylinOrderRefundsVoBase.getOrderRefundCode().length() - 10));
}
vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
vo.setOrderTicketVo(orderTicketVo);
return ResponseDto.success(vo);
......
liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/impl/PayChannelStrategyAlipayImpl.java
View file @ b2d54abf
......@@ -97,6 +97,7 @@ public class PayChannelStrategyAlipayImpl extends AbstractPayChannelStrategyImpl
//退款
if(notifyMap.containsKey("refund_fee") || notifyMap.containsKey("gmt_refund") || notifyMap.containsKey("out_biz_no")) {
returnStr = dragonOrderRefundsService.aliPayRefundCallBack(JSON.toJSONString(notifyMap));
return returnStr;
}
// 根据银行订单号获取支付信息
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java
View file @ b2d54abf
......@@ -194,7 +194,7 @@ public class SweetAppletController {
if (uid.equalsIgnoreCase("0")) {
return ResponseDto.failure();
}
redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "sign");
redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "watch");
return ResponseDto.success();
}
......@@ -209,7 +209,7 @@ public class SweetAppletController {
if (uid.equalsIgnoreCase("0")) {
return ResponseDto.failure();
}
redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "watch");
redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "sign");
return ResponseDto.success();
}
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java
View file @ b2d54abf
......@@ -216,14 +216,15 @@ public class RedisDataUtils {
ArrayList<String> watchList = new ArrayList<>();
watchList.add(artistsId);
vo.setWatchList(watchList);
}
if (vo.getWatchList().contains(artistsId)) {
vo.getWatchList().remove(artistsId);
} else {
vo.getWatchList().add(artistsId);
if (vo.getWatchList().contains(artistsId)) {
vo.getWatchList().remove(artistsId);
} else {
vo.getWatchList().add(artistsId);
}
}
}
redisUtil.set(redisKey, vo);
}
......
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