...
|
...
|
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service; |
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.google.common.base.Splitter;
|
|
|
import com.yoho.core.dal.datasource.annotation.Database;
|
...
|
...
|
@@ -1857,6 +1858,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { |
|
|
data.put("custid", "***");
|
|
|
data.put("dWholeAddress", jsonReqObj.getString("dProvince") + jsonReqObj.getString("dCity") + jsonReqObj.getString("dDistrict") + jsonReqObj.getString("dAddress"));
|
|
|
//data.put("twoDimensionCode", data.getJSONObject("twoDimensionCode"));
|
|
|
data.put("cargoInfo", "[衣服鞋帽]*1");
|
|
|
|
|
|
LOGGER.info("method getSfWaybillCode Result is {}", data);
|
|
|
|
...
|
...
|
@@ -1940,6 +1942,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { |
|
|
jsonObj.put("businessCode", "UFO");
|
|
|
jsonObj.put("custid", getCustId(req.getPhoneUid(), sellerGoods.getDepotNo()));
|
|
|
|
|
|
JSONArray cargoArr = new JSONArray();
|
|
|
JSONObject cargoObj = new JSONObject();
|
|
|
cargoObj.put("name", "衣服鞋帽");
|
|
|
cargoObj.put("count", 1);
|
|
|
cargoObj.put("unit", "件");
|
|
|
cargoArr.add(cargoObj);
|
|
|
jsonObj.put("cargo", cargoArr);
|
|
|
|
|
|
//收件人信息
|
|
|
if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal())
|
|
|
|| buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_MINI_FAULT_ACCEPT.getByteVal())) {//收件人为买家
|
...
|
...
|
|