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

Commit 37652730 authored by 胡佳晨's avatar 胡佳晨

修改 ErrorMapping Code

parent 48914585
...@@ -10,6 +10,7 @@ import com.liquidnet.client.admin.common.utils.DateUtils; ...@@ -10,6 +10,7 @@ import com.liquidnet.client.admin.common.utils.DateUtils;
import com.liquidnet.client.admin.common.utils.ShiroUtils; import com.liquidnet.client.admin.common.utils.ShiroUtils;
import com.liquidnet.commons.lang.util.BeanUtil; import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.JsonUtils; import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.kylin.constant.KylinTableStatusConst; import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
import com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao; import com.liquidnet.service.kylin.dao.KylinOrderRefundsEntitiesDao;
...@@ -154,7 +155,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -154,7 +155,7 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
for (int i = 0; i <= ticketEntityIds.size() - 1; i++) { for (int i = 0; i <= ticketEntityIds.size() - 1; i++) {
Double price = entitiesPrice.get(i); Double price = entitiesPrice.get(i);
if (price < 0) { if (price < 0) {
return ResponseDto.failure("退款金额不能为0"); return ResponseDto.failure(ErrorMapping.get("20021"));
} else { } else {
Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退 Double refundedPrice = kylinOrderTicketEntitiesMapper.getRefundEntitiesPrice(//已退
orderTicketsId, orderTicketsId,
......
...@@ -53,7 +53,7 @@ public class KylinOrderTicketsController { ...@@ -53,7 +53,7 @@ public class KylinOrderTicketsController {
public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) { public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData(); PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData();
if (null == vo) { if (null == vo) {
return ResponseDto.failure("订单已失效"); return ResponseDto.failure(ErrorMapping.get("20024"));
} else { } else {
return ResponseDto.success(vo); return ResponseDto.success(vo);
} }
......
...@@ -116,7 +116,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -116,7 +116,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
String uid = CurrentUtil.getCurrentUid(); String uid = CurrentUtil.getCurrentUid();
String lock = "userId:" + uid; String lock = "userId:" + uid;
if (!redisLockUtil.tryLock(lock, 1, 5)) { if (!redisLockUtil.tryLock(lock, 1, 5)) {
return ResponseDto.failure("请求频繁");//参数错误 return ResponseDto.failure(ErrorMapping.get("20023"));//参数错误
} }
try { try {
currentTime = System.currentTimeMillis(); currentTime = System.currentTimeMillis();
...@@ -642,25 +642,25 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -642,25 +642,25 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return null; return null;
} }
if (orderTicketData == null) { if (orderTicketData == null) {
return ResponseDto.failure("订单不存在"); return ResponseDto.failure(ErrorMapping.get("20024"));
} }
if (orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) { if (orderTicketData.getStatus() == KylinTableStatusConst.ORDER_STATUS1) {
return ResponseDto.failure("订单已支付"); return ResponseDto.failure(ErrorMapping.get("20025"));
} else { } else {
if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) { if (orderTicketData.getStatus() != KylinTableStatusConst.ORDER_STATUS0) {
return ResponseDto.failure("订单已关闭"); return ResponseDto.failure(ErrorMapping.get("20026"));
} }
} }
String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null); String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null);
PayResultVo checkVo = JsonUtils.fromJson(returnCheckData, PayResultVo.class); PayResultVo checkVo = JsonUtils.fromJson(returnCheckData, PayResultVo.class);
if (checkVo.getStatus() == 1) { if (checkVo.getStatus() == 1) {
return ResponseDto.failure("'您已支付请刷新再试'"); return ResponseDto.failure(ErrorMapping.get("20027"));
} }
if (!orderTicketData.getPayType().equals("no")) { if (!orderTicketData.getPayType().equals("no")) {
if (orderTicketData.getEntitiesVoList().size() == 0) { if (orderTicketData.getEntitiesVoList().size() == 0) {
return ResponseDto.failure("参数错误"); return ResponseDto.failure(ErrorMapping.get("20004"));
} }
KylinOrderTicketEntitiesVo entitiesData = orderTicketData.getEntitiesVoList().get(0); KylinOrderTicketEntitiesVo entitiesData = orderTicketData.getEntitiesVoList().get(0);
...@@ -734,10 +734,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -734,10 +734,10 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
log.info(UserPathDto.setData("再次支付", payAgainParam, payResultVo)); log.info(UserPathDto.setData("再次支付", payAgainParam, payResultVo));
return ResponseDto.success(payResultVo); return ResponseDto.success(payResultVo);
} }
return ResponseDto.failure("未选择支付方式"); return ResponseDto.failure(ErrorMapping.get("20029"));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return ResponseDto.failure("订单已失效"); return ResponseDto.failure(ErrorMapping.get("20028"));
} }
} }
...@@ -1078,7 +1078,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -1078,7 +1078,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return null; return null;
} }
if (orderTicketData == null) { if (orderTicketData == null) {
return ResponseDto.failure("订单不存在"); return ResponseDto.failure(ErrorMapping.get("20024"));
} else { } else {
String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null); String returnCheckData = HttpUtil.get(checkUrl + "?code=" + orderTicketData.getPayCode(), null);
PayResultVo checkVo = JsonUtils.fromJson(returnCheckData, PayResultVo.class); PayResultVo checkVo = JsonUtils.fromJson(returnCheckData, PayResultVo.class);
...@@ -1194,7 +1194,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -1194,7 +1194,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
BigDecimal refundSinglePrice = dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, orderTicketEntitiesId); BigDecimal refundSinglePrice = dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, orderTicketEntitiesId);
if(refundSinglePrice.doubleValue()<=0){ if(refundSinglePrice.doubleValue()<=0){
return ResponseDto.failure("申请金额不得小于0"); return ResponseDto.failure(ErrorMapping.get("20022"));
} }
Map token = CurrentUtil.getTokenClaims(); Map token = CurrentUtil.getTokenClaims();
String username = StringUtils.defaultString(((String) token.get("nickname")), ""); String username = StringUtils.defaultString(((String) token.get("nickname")), "");
...@@ -1223,7 +1223,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -1223,7 +1223,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
try { try {
KylinOrderRefundsVoBase orderRefundsVo = dataUtils.getOrderRefundVo(orderRefundsId); KylinOrderRefundsVoBase orderRefundsVo = dataUtils.getOrderRefundVo(orderRefundsId);
if(!orderRefundsVo.getStatus().equals(0)){ if(!orderRefundsVo.getStatus().equals(0)){
return ResponseDto.failure("当前状态不可撤回"); return ResponseDto.failure(ErrorMapping.get("20020"));
} }
List<KylinOrderRefundEntitiesVo> refundEntities = orderRefundsVo.getOrderRefundEntitiesVoList(); List<KylinOrderRefundEntitiesVo> refundEntities = orderRefundsVo.getOrderRefundEntitiesVoList();
String orderTicketsId = orderRefundsVo.getOrderTicketsId(); String orderTicketsId = orderRefundsVo.getOrderTicketsId();
...@@ -1354,7 +1354,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService { ...@@ -1354,7 +1354,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
return ResponseDto.success(true); return ResponseDto.success(true);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return ResponseDto.failure("当前状态不可撤回"); return ResponseDto.failure(ErrorMapping.get("20020"));
} }
} }
......
...@@ -23,6 +23,16 @@ ...@@ -23,6 +23,16 @@
20017=年龄不符合 20017=年龄不符合
20018=下单失败 20018=下单失败
20019=申请失败 20019=申请失败
20020=当前状态不可撤回
20021=退款金额不能为0
20022=申请金额不得小于0
20023=请求频繁
20024=订单不存在
20025=订单已支付
20026=订单已关闭
20028=订单已失效
20027=您已支付请刷新再试
20029=未选择支付方式
#APP PARTNER #APP PARTNER
20101=添加失败 20101=添加失败
......
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