ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit 74c704f0b0834d439992703843b10eff1644fc2f 1 parent 37f404a9

托寄物名称

Inline Side-by-side
Showing 1 changed file with 10 additions and 0 deletions
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service; @@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
31 import org.springframework.web.client.RestTemplate; 31 import org.springframework.web.client.RestTemplate;
32 32
33 import com.alibaba.fastjson.JSON; 33 import com.alibaba.fastjson.JSON;
  34 +import com.alibaba.fastjson.JSONArray;
34 import com.alibaba.fastjson.JSONObject; 35 import com.alibaba.fastjson.JSONObject;
35 import com.google.common.base.Splitter; 36 import com.google.common.base.Splitter;
36 import com.yoho.core.dal.datasource.annotation.Database; 37 import com.yoho.core.dal.datasource.annotation.Database;
@@ -1857,6 +1858,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -1857,6 +1858,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
1857 data.put("custid", "***"); 1858 data.put("custid", "***");
1858 data.put("dWholeAddress", jsonReqObj.getString("dProvince") + jsonReqObj.getString("dCity") + jsonReqObj.getString("dDistrict") + jsonReqObj.getString("dAddress")); 1859 data.put("dWholeAddress", jsonReqObj.getString("dProvince") + jsonReqObj.getString("dCity") + jsonReqObj.getString("dDistrict") + jsonReqObj.getString("dAddress"));
1859 //data.put("twoDimensionCode", data.getJSONObject("twoDimensionCode")); 1860 //data.put("twoDimensionCode", data.getJSONObject("twoDimensionCode"));
  1861 + data.put("cargoInfo", "[衣服鞋帽]*1");
1860 1862
1861 LOGGER.info("method getSfWaybillCode Result is {}", data); 1863 LOGGER.info("method getSfWaybillCode Result is {}", data);
1862 1864
@@ -1940,6 +1942,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -1940,6 +1942,14 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
1940 jsonObj.put("businessCode", "UFO"); 1942 jsonObj.put("businessCode", "UFO");
1941 jsonObj.put("custid", getCustId(req.getPhoneUid(), sellerGoods.getDepotNo())); 1943 jsonObj.put("custid", getCustId(req.getPhoneUid(), sellerGoods.getDepotNo()));
1942 1944
  1945 + JSONArray cargoArr = new JSONArray();
  1946 + JSONObject cargoObj = new JSONObject();
  1947 + cargoObj.put("name", "衣服鞋帽");
  1948 + cargoObj.put("count", 1);
  1949 + cargoObj.put("unit", "件");
  1950 + cargoArr.add(cargoObj);
  1951 + jsonObj.put("cargo", cargoArr);
  1952 +
1943 //收件人信息 1953 //收件人信息
1944 if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal()) 1954 if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal())
1945 || buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_MINI_FAULT_ACCEPT.getByteVal())) {//收件人为买家 1955 || buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_MINI_FAULT_ACCEPT.getByteVal())) {//收件人为买家