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

Commit 0087890d authored by jiangxiulong's avatar jiangxiulong

去掉system。out

parent d8eebdee
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
}, },
{ {
field: 'orderExpressId', field: 'orderExpressId',
title: '订单ID' title: '快递ID'
}, },
{ {
field: 'orderTicketsId', field: 'orderTicketsId',
......
...@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.utils.StringUtils;
import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.CodeUtil; import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.CodeUtil;
import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.UploadUtil; import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.UploadUtil;
import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.ZipMultiFileUtil; import com.liquidnet.client.admin.zhengzai.admin.service.impl.utils.ZipMultiFileUtil;
...@@ -23,7 +22,6 @@ import com.liquidnet.service.kylin.entity.*; ...@@ -23,7 +22,6 @@ import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*; import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.IKylinOrderExpress; import com.liquidnet.service.kylin.service.IKylinOrderExpress;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
...@@ -205,7 +203,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres ...@@ -205,7 +203,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求 // 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/placeOrder"); String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/placeOrder");
System.out.println(result); // System.out.println(result);
HashMap hashMap = new HashMap(); HashMap hashMap = new HashMap();
try { try {
hashMap = JsonUtils.fromJson(result, HashMap.class); hashMap = JsonUtils.fromJson(result, HashMap.class);
...@@ -300,26 +298,20 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres ...@@ -300,26 +298,20 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
} }
public ResponseDto cancelOrder(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) { public ResponseDto cancelOrder(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
log.error("cancelOrder {}", "");
log.info("cancelOrder {}", "");
log.debug("cancelOrder {}", "");
List<String> ids = performanceExpressSearchAdminParam.getIds(); List<String> ids = performanceExpressSearchAdminParam.getIds();
Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3}; Integer[] expressStatus = {KylinTableStatusConst.ORDER_EXPRESS_STATUS1, KylinTableStatusConst.ORDER_EXPRESS_STATUS3};
for (String orderTicketsId : ids) { for (String orderTicketsId : ids) {
log.error("id {}", orderTicketsId);
KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne( KylinOrderExpress orderExpressInfo = kylinOrderExpressMapper.selectOne(
new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId) new QueryWrapper<KylinOrderExpress>().eq("order_tickets_id", orderTicketsId)
.notIn("express_status", expressStatus) .notIn("express_status", expressStatus)
); );
if (null != orderExpressInfo) { if (null != orderExpressInfo) {
log.error("orderExpressInfo {}", "true");
Map<String, String> hBody = new HashMap<>(); Map<String, String> hBody = new HashMap<>();
hBody.put("orderId", orderExpressInfo.getOrderExpressCode()); hBody.put("orderId", orderExpressInfo.getOrderExpressCode());
// 生成签名并请求 // 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/cancelOrder"); String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/cancelOrder");
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class); HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
log.error("result {}", result);
if (hashMap.get("succ").equals("fail")) { if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg"); String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg); return ResponseDto.failure(msg);
...@@ -366,7 +358,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres ...@@ -366,7 +358,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求 // 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getResult"); String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getResult");
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class); HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
System.out.println(result); // System.out.println(result);
if (hashMap.get("succ").equals("fail")) { if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg"); String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg); return ResponseDto.failure(msg);
...@@ -420,7 +412,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres ...@@ -420,7 +412,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求 // 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getFreight"); String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getFreight");
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class); HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
System.out.println(result); // System.out.println(result);
if (hashMap.get("succ").equals("fail")) { if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg"); String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg); return ResponseDto.failure(msg);
...@@ -456,7 +448,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres ...@@ -456,7 +448,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求 // 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getListFreight"); String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getListFreight");
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class); HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
System.out.println(result); // System.out.println(result);
if (hashMap.get("succ").equals("fail")) { if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg"); String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg); return ResponseDto.failure(msg);
...@@ -498,7 +490,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres ...@@ -498,7 +490,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
// 生成签名并请求 // 生成签名并请求
String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/listOrderRoute"); String result = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/listOrderRoute");
HashMap hashMap = JsonUtils.fromJson(result, HashMap.class); HashMap hashMap = JsonUtils.fromJson(result, HashMap.class);
System.out.println(result); // System.out.println(result);
if (hashMap.get("succ").equals("fail")) { if (hashMap.get("succ").equals("fail")) {
String msg = (String) hashMap.get("msg"); String msg = (String) hashMap.get("msg");
return ResponseDto.failure(msg); return ResponseDto.failure(msg);
......
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