YOHOBUY / yohobuy-union · Commits

Go to a project

Authored by zhengwen.ge
Commit 895fc52b9b6f6ce2511fb53f46887879f502a519 1 parent 04199238

update

Inline Side-by-side
Showing 2 changed files with 6 additions and 1 deletions
@@ -90,7 +90,7 @@ public class OrderUnionRest { @@ -90,7 +90,7 @@ public class OrderUnionRest {
90 orderInfo.setClientId("1001"); 90 orderInfo.setClientId("1001");
91 orderInfo.setIsNew("N"); 91 orderInfo.setIsNew("N");
92 orderInfo.setMbrName("12776646"); 92 orderInfo.setMbrName("12776646");
93 - orderInfo.setTrackingCode("NDgwMDB8MDBvYzI3MGJhZjU5MGI1YTQ1ZDk="); 93 +// orderInfo.setTrackingCode("NDgwMDB8MDBvYzI3MGJhZjU5MGI1YTQ1ZDk=");
94 orderInfo.setThirdUid("123"); 94 orderInfo.setThirdUid("123");
95 List<OrdersGood> ordersGoods = new ArrayList<>(); 95 List<OrdersGood> ordersGoods = new ArrayList<>();
96 for(int i = 0;i<4;i++){ 96 for(int i = 0;i<4;i++){
@@ -136,7 +136,12 @@ public class OrderPushServiceImpl implements IOrderPushService{ @@ -136,7 +136,12 @@ public class OrderPushServiceImpl implements IOrderPushService{
136 param.put("commRate", commRate == null?0:commRate); 136 param.put("commRate", commRate == null?0:commRate);
137 //对应多麦的站长id 137 //对应多麦的站长id
138 param.put("mbrName",orderInfo.getMbrName()); 138 param.put("mbrName",orderInfo.getMbrName());
  139 + if(StringUtils.isNotEmpty(orderInfo.getTrackingCode())){
139 param.put("channelCode",orderInfo.getTrackingCode()); 140 param.put("channelCode",orderInfo.getTrackingCode());
  141 + }else{
  142 + param.put("channelCode","");
  143 + }
  144 +
140 Pair<Integer, String> pair = null; 145 Pair<Integer, String> pair = null;
141 try { 146 try {
142 String url = unionOrderPush.getUrl(); 147 String url = unionOrderPush.getUrl();