修改bug文档bug

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -23,6 +23,7 @@ import com.iamberry.rst.faces.sys.SysConfigService;
 import com.iamberry.rst.faces.sys.SysService;
 import com.iamberry.rst.service.cm.mapper.CustomerInfoMapper;
 import com.iamberry.rst.service.sms.mapper.MessageMapper;
+import com.iamberry.rst.utils.EfastUtil;
 import com.iamberry.rst.utils.KuaiDi100;
 import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ResponseJson;
@@ -85,6 +86,8 @@ public class MQTask implements InitializingBean {
 	private PostageService postageService;
 	@Autowired
 	private  CompanyInfoService companyInfoService;
+	@Autowired
+	private  EfastUtil efastUtil;
 
 	private Object lock = new Object();
 	private Object lock1 = new Object();
@@ -246,7 +249,8 @@ public class MQTask implements InitializingBean {
 		if(listRepair.size() > 0){
 			for(Repair re:listRepair){
 				if(re.getSalesDealCode() != null){
-					EfastOrder efastOrder = efastOrderService.getFromEfastOrderInfo(re.getSalesDealCode());
+					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRepairBackEfastOrderId());
+					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
 					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
 						re.setRepairSendName(efastOrder.getOrderAddressName());
 						re.setRepairSendTel(efastOrder.getOrderAddressTel());
@@ -278,7 +282,8 @@ public class MQTask implements InitializingBean {
 		if(listRenewed.size() > 0){
 			for(Renewed re:listRenewed){
 				if(re.getSalesDealCode() != null){
-					EfastOrder efastOrder = efastOrderService.getFromEfastOrderInfo(re.getSalesDealCode());
+					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRenewedBackEfastOrderId());
+					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
 					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
 						re.setRenewedSendName(efastOrder.getOrderAddressName());
 						re.setRenewedSendTel(efastOrder.getOrderAddressTel());
@@ -308,7 +313,8 @@ public class MQTask implements InitializingBean {
 		if(listReissue.size() > 0){
 			for(Reissue re:listReissue){
 				if(re.getSalesDealCode() != null){
-					EfastOrder efastOrder = efastOrderService.getFromEfastOrderInfo(re.getSalesDealCode());
+					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getReissueBackEfastOrderId());
+					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
 					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
 						re.setReissueSendName(efastOrder.getOrderAddressName());
 						re.setReissueSendTel(efastOrder.getOrderAddressTel());

watero-rst-web/src/main/java/com/iamberry/rst/utils/EfastUtil.java

@@ -0,0 +1,64 @@
+package com.iamberry.rst.utils;
+
+import com.iamberry.rst.core.order.EfastOrder;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+
+/**
+ * Created by Administrator on 2017/8/15.
+ */
+@Component
+public class EfastUtil {
+    /**efast返回数据转换**/
+    public EfastOrder respDataConversion(JSONObject respData) {
+        if(respData == null){
+            return null;
+        }
+        // 发货状态 : shipping_status
+        String shoppingStatus = respData.getString("shipping_status");
+        String shoppingOrderId = respData.getString("order_id");
+        String consignee = respData.getString("consignee");//收货人
+        String address = respData.getString("address");//收货地址
+        String mobile = respData.getString("mobile");//手机号
+        String province = respData.getString("province");//省
+        String city = respData.getString("city");//市
+        String district = respData.getString("district");//区
+        String invoice_no = respData.getString("invoice_no");//快递单号
+        String shipping_name = respData.getString("shipping_name");//快递公司
+
+        String goods_name = "";
+        String goods_number = "";
+        JSONArray citys = respData.getJSONArray("orders");
+        for (int i = 0; i < citys.size(); i++) {
+            JSONObject orderJson = JSONObject.fromObject(citys.get(i));
+            goods_name = orderJson.getString("goods_name");
+            goods_number = orderJson.getString("goods_number");
+        }
+        if (StringUtils.isNotEmpty(shoppingStatus)) {
+            EfastOrder efastOrder = new EfastOrder();
+            efastOrder.setOrderStatus(Integer.parseInt(shoppingStatus));
+            efastOrder.setOrderId(shoppingOrderId);
+            efastOrder.setOrderAddressName(consignee);
+            efastOrder.setOrderAddress(address);
+            efastOrder.setOrderAddressTel(mobile);
+            efastOrder.setOrderProvince(province);
+            efastOrder.setOrderCity(city);
+            efastOrder.setOrderArea(district);
+            efastOrder.setOrderPostNum(invoice_no);
+            efastOrder.setOrderPostFirm(shipping_name);
+            efastOrder.setRepairSendMergeAddress(province + "-" + city + "-" + district);
+            efastOrder.setOrderProductName(goods_name);
+            efastOrder.setOrderNum(Integer.valueOf(goods_number));
+            return efastOrder;
+        }
+        return null;
+    }
+}