Authored by 邱骏

update

@@ -1819,6 +1819,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -1819,6 +1819,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
1819 data.put("amount", "**元"); 1819 data.put("amount", "**元");
1820 data.put("businessType", data.getString("proCode").equals("T6") ? "顺丰特惠" : "标准快递"); 1820 data.put("businessType", data.getString("proCode").equals("T6") ? "顺丰特惠" : "标准快递");
1821 data.put("custid", "***"); 1821 data.put("custid", "***");
  1822 + data.put("cargoInfo", "[衣服鞋帽]*1");
1822 data.put("dWholeAddress", jsonReqObj.getString("dProvince") + jsonReqObj.getString("dCity") + jsonReqObj.getString("dDistrict") + jsonReqObj.getString("dAddress")); 1823 data.put("dWholeAddress", jsonReqObj.getString("dProvince") + jsonReqObj.getString("dCity") + jsonReqObj.getString("dDistrict") + jsonReqObj.getString("dAddress"));
1823 //data.put("twoDimensionCode", data.getJSONObject("twoDimensionCode")); 1824 //data.put("twoDimensionCode", data.getJSONObject("twoDimensionCode"));
1824 1825
@@ -1904,6 +1905,12 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -1904,6 +1905,12 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
1904 jsonObj.put("businessCode", "UFO"); 1905 jsonObj.put("businessCode", "UFO");
1905 jsonObj.put("custid", getCustId(req.getPhoneUid(), sellerGoods.getDepotNo())); 1906 jsonObj.put("custid", getCustId(req.getPhoneUid(), sellerGoods.getDepotNo()));
1906 1907
  1908 + JSONObject cargoObj = new JSONObject();
  1909 + cargoObj.put("name", "衣服鞋帽");
  1910 + cargoObj.put("count", 1);
  1911 + cargoObj.put("unit", "件");
  1912 + jsonObj.put("cargo", cargoObj);
  1913 +
1907 //收件人信息 1914 //收件人信息
1908 if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal()) 1915 if(buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal())
1909 || buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_MINI_FAULT_ACCEPT.getByteVal())) {//收件人为买家 1916 || buyerOrder.getStatus().equals(Constant.BUYER_ORDER_STATUS_MINI_FAULT_ACCEPT.getByteVal())) {//收件人为买家
@@ -2762,4 +2769,5 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -2762,4 +2769,5 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
2762 } 2769 }
2763 } 2770 }
2764 } 2771 }
  2772 +
2765 } 2773 }