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

Commit e90c904b authored by jiangxiulong's avatar jiangxiulong

refund test

parent 96eecd83
...@@ -285,9 +285,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -285,9 +285,9 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
break; break;
case "reject": case "reject":
boolean cancelRes = kylinRefundsStatusServiceImpl.orderTicketRefundCancel(refundList, false); boolean cancelRes = kylinRefundsStatusServiceImpl.orderTicketRefundCancel(refundList, false);
if (cancelRes) { log.info("取消处理" + cancelRes);
res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, ""); log.info("取消处理ing");
} res = kylinRefundsStatusServiceImpl.orderRefundChangeStatus(refundList, type, reject, "");
break; break;
case "unfilled": case "unfilled":
res = kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse); res = kylinRefundsStatusServiceImpl.orderTicketRefundUnfilled(refundList, refuse);
...@@ -380,7 +380,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -380,7 +380,8 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
KylinOrderRefundPic kylinOrderRefundPic = kylinOrderRefundPicMapper.selectOne(new UpdateWrapper<KylinOrderRefundPic>().eq("order_refunds_id", orderRefundId)); KylinOrderRefundPic kylinOrderRefundPic = kylinOrderRefundPicMapper.selectOne(new UpdateWrapper<KylinOrderRefundPic>().eq("order_refunds_id", orderRefundId));
if (kylinOrderRefundPic != null) { if (kylinOrderRefundPic != null) {
String picStr = kylinOrderRefundPic.getPicUrl(); String picStr = kylinOrderRefundPic.getPicUrl();
List<String> strList = JsonUtils.fromJson(picStr, new TypeReference<List<String>>() {}); List<String> strList = JsonUtils.fromJson(picStr, new TypeReference<List<String>>() {
});
kylinOrderRefundsVo.setPicList(strList); kylinOrderRefundsVo.setPicList(strList);
} }
...@@ -473,20 +474,20 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM ...@@ -473,20 +474,20 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
} }
@Override @Override
public String getOrderRefundCode(String code,int type) { public String getOrderRefundCode(String code, int type) {
String orderCode = null; String orderCode = null;
if(type==1){ if (type == 1) {
KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(new UpdateWrapper<KylinOrderRefunds>().like("order_refund_code",code)); KylinOrderRefunds data = kylinOrderRefundsMapper.selectOne(new UpdateWrapper<KylinOrderRefunds>().like("order_refund_code", code));
if(data==null){ if (data == null) {
return null; return null;
}else{ } else {
orderCode = data.getOrderRefundCode(); orderCode = data.getOrderRefundCode();
} }
}else if(type==2){ } else if (type == 2) {
KylinOrderTickets data = kylinOrderTicketsMapper.selectOne(new UpdateWrapper<KylinOrderTickets>().like("order_code",code)); KylinOrderTickets data = kylinOrderTicketsMapper.selectOne(new UpdateWrapper<KylinOrderTickets>().like("order_code", code));
if(data==null){ if (data == null) {
return null; return null;
}else{ } else {
orderCode = data.getOrderCode(); orderCode = data.getOrderCode();
} }
} }
......
...@@ -334,6 +334,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -334,6 +334,7 @@ public class KylinRefundsStatusServiceImpl {
} }
public boolean orderRefundChangeStatus(List<KylinOrderRefunds> refundList, String type, String reject, String refuse) { public boolean orderRefundChangeStatus(List<KylinOrderRefunds> refundList, String type, String reject, String refuse) {
log.info("orderRefundChangeStatus ----- in");
String authId = ShiroUtils.getUserId().toString(); String authId = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName(); String authName = ShiroUtils.getLoginName();
KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds(); KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
......
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