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

Commit a68c3168 authored by jiangxiulong's avatar jiangxiulong

去掉测试注释 收方付款

parent 3580593a
...@@ -165,7 +165,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres ...@@ -165,7 +165,7 @@ public class PerformancesExpressServiceImpl extends ServiceImpl<KylinOrderExpres
hBody.put("jAddress", jAddress); hBody.put("jAddress", jAddress);
// TODO: 2021/6/30 前端选择 // TODO: 2021/6/30 前端选择
hBody.put("payMethod", 0);// 运费付款方式:0-寄付月结;1-寄付现结;2-收方付;3-第三方付; hBody.put("payMethod", 2);// 运费付款方式:0-寄付月结;1-寄付现结;2-收方付;3-第三方付;
hBody.put("expressType", expressType);// 顺丰特快 hBody.put("expressType", expressType);// 顺丰特快
hBody.put("depositumInfo", depositumInfo); hBody.put("depositumInfo", depositumInfo);
......
...@@ -125,8 +125,8 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd ...@@ -125,8 +125,8 @@ public class PerformancesExpressCallbackServiceImpl extends ServiceImpl<KylinOrd
} }
public boolean orderRoute(@RequestBody String params) { public boolean orderRoute(@RequestBody String params) {
// boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest); boolean res = shunfengSignUtils.receiveRequestAndCheckSign(params, httpServletRequest);
if (true) { if (res) {
PerformanceExpressPushRouteParam performanceExpressPushRouteParam = JsonUtils.fromJson(params, PerformanceExpressPushRouteParam.class); PerformanceExpressPushRouteParam performanceExpressPushRouteParam = JsonUtils.fromJson(params, PerformanceExpressPushRouteParam.class);
KylinOrderExpressRoute kylinOrderExpressRoute = new KylinOrderExpressRoute(); KylinOrderExpressRoute kylinOrderExpressRoute = new KylinOrderExpressRoute();
String orderExpressRouteId = IDGenerator.nextSnowId(); String orderExpressRouteId = IDGenerator.nextSnowId();
......
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