Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -1346,8 +1346,8 @@ public class CustomerServiceImpl implements CustomerService {
                             if (reissue.getCustomerId().intValue() == customer.getCustomerId()) {
                                 customer.setSendStatus(reissue.getReissueSendStatus());
                                 customer.setSalesTime(reissue.getSalesPayTime());
-                                customer.setBackLogisticsNo(reissue.getReissueSendLogisticsNo());
-                                customer.setBackLogisticsCompany(reissue.getReissueSendLogisticsCompany());
+                                customer.setSendLogisticsNo(reissue.getReissueSendLogisticsNo());
+                                customer.setSendLogisticsCompany(reissue.getReissueSendLogisticsCompany());
                                 break;
                             }
                         }
@@ -1357,7 +1357,8 @@ public class CustomerServiceImpl implements CustomerService {
                             if (backGoods.getCustomerId().intValue() == customer.getCustomerId()) {
                                 customer.setBackStatus(backGoods.getBackGoodsBackStatus());
                                 customer.setSalesTime(backGoods.getSalesPayTime());
-                                customer.setSendLogisticsNo(backGoods.getBackGoodsBackLogisticsNo());
+                                customer.setBackLogisticsNo(backGoods.getBackGoodsBackLogisticsNo());
+                                customer.setBackLogisticsCompany(backGoods.getBackGoodsBackLogisticsCompany());
                                 break;
                             }
                         }
@@ -1367,8 +1368,8 @@ public class CustomerServiceImpl implements CustomerService {
                             if (noreasonBack.getCustomerId().intValue() == customer.getCustomerId()) {
                                 customer.setBackStatus(noreasonBack.getNoreasonBackBackStatus());
                                 customer.setSalesTime(noreasonBack.getSalesPayTime());
-                                customer.setSendLogisticsNo(noreasonBack.getNoreasonBackBackLogisticsNo());
-                                customer.setSendLogisticsCompany(noreasonBack.getNoreasonBackBackLogisticsCompany());
+                                customer.setBackLogisticsNo(noreasonBack.getNoreasonBackBackLogisticsNo());
+                                customer.setBackLogisticsCompany(noreasonBack.getNoreasonBackBackLogisticsCompany());
                                 break;
                             }
                         }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/reissueMapper.xml

@@ -294,17 +294,17 @@
   <!-- 查询售后补发需要同步订单的数据集合 -->
   <select id="listSynchronizingReissue" resultType="Reissue" parameterType="Reissue">
     select
-    r.*,
-    o.sales_deal_code salesDealCode
+    r.*
     from
     tb_rst_reissue r
-    LEFT JOIN tb_rst_sales_order_info o ON r.reissue_back_efast_order_id = o.sales_orderId
     <where>
       <if test="reissueSendStatus != null and reissueSendStatus != ''">
         and reissue_send_status = #{reissueSendStatus}
       </if>
-      AND r.reissue_send_logistics_company != ''
-      AND r.reissue_send_logistics_no != ''
+      AND r.reissue_back_efast_order_id is not NULL
+      AND trim(r.reissue_back_efast_order_id) != ''
+      AND (r.reissue_send_logistics_company is null
+      or trim(r.reissue_send_logistics_company)='')
     </where>
   </select>
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/renewedMapper.xml

@@ -316,17 +316,17 @@
   <!-- 查询售后换新需要同步订单的数据集合 -->
   <select id="listSynchronizingRenewed" resultType="Renewed" parameterType="Renewed">
     select
-    r.*,
-    o.sales_deal_code salesDealCode
+    r.*
     from
     tb_rst_renewed r
-    LEFT JOIN tb_rst_sales_order_info o ON r.renewed_back_efast_order_id = o.sales_orderId
     <where>
       <if test="renewedSendStatus != null and renewedSendStatus != ''">
         and r.renewed_send_status = #{renewedSendStatus}
       </if>
-      AND r.renewed_send_logistics_company != ''
-      AND r.renewed_send_logistics_no != ''
+      AND r.renewed_back_efast_order_id is not NULL
+      AND trim(r.renewed_back_efast_order_id) != ''
+      AND (r.renewed_send_logistics_company is null
+      or trim(r.renewed_send_logistics_company)='')
     </where>
   </select>
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/repairMapper.xml

@@ -339,11 +339,9 @@
   <!-- 查询售后维修需要同步订单的数据集合 -->
   <select id="listSynchronizingRepair" resultType="Repair" parameterType="Repair">
     select
-    r.*,
-    o.sales_deal_code salesDealCode
+    r.*
     from
     tb_rst_repair r
-    LEFT JOIN tb_rst_sales_order_info o ON r.repair_back_efast_order_id = o.sales_orderId
     <where>
       <if test="repairState != null">
         repair_state = #{repairState}
@@ -354,8 +352,10 @@
       <if test="repairSendStatus != null and repairSendStatus != ''">
         and repair_send_status = #{repairSendStatus}
       </if>
-      AND r.repair_send_logistics_company != ''
-      AND r.repair_send_logistics_no != ''
+        AND r.repair_back_efast_order_id is not NULL
+        AND trim(r.repair_back_efast_order_id) != ''
+        AND (r.repair_send_logistics_company is null
+        or trim(r.repair_send_logistics_company)='')
     </where>
   </select>
 </mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/order/EfastOrderServiceImpl.java

@@ -493,18 +493,18 @@ public class EfastOrderServiceImpl implements EfastOrderService {
             if (m.find()) {
                 result = m.replaceAll("");
             }
-            logger.info("rst-getOrderFormEfastByOrderId-推送百胜订单号-->>" + orderid + "，百胜返回信息-->" + result);
+            logger.info("rst-getOrderFormEfastByOrderId-查询百胜订单详细信息-->>" + orderid + "，百胜返回信息-->" + result);
             // parse JSON String to Object
             JSONObject jsonObject = JSONObject.fromObject(result);
             JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
             if (respData != null) {
                 return respData;
             } else {
-                logger.error("rst-获取百胜出错，订单号-->>" + orderid + "，百胜返回信息-->" + result);
+                logger.error("rst-查询百胜订单详细信息出错，订单号-->>" + orderid + "，百胜返回信息-->" + result);
                 throw new Exception(respData.getString("msg"));
             }
         } catch (Exception e) {
-            logger.error("rst-获取百胜出错，订单号-->>" + orderid + "，catch");
+            logger.error("rst-查询百胜订单详细信息出错，订单号-->>" + orderid + "，catch");
             throw e;
         }
     }

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

@@ -241,93 +241,95 @@ public class MQTask implements InitializingBean {
 
 	/**客诉系统  自动追踪发货信息**/
 	@Scheduled(cron = "0 0/30 * * * ?")//每30分钟执行一次
+	/*@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次*/
 	public void synchronousDelivery()throws Exception{
 		/*同步维修订单*/
 		Repair repair = new Repair();
-		repair.setRepairSendStatus(1);
 		List<Repair> listRepair = repairService.listSynchronizingRepair(repair);
 		if(listRepair.size() > 0){
 			for(Repair re:listRepair){
-				if(re.getSalesDealCode() != null){
 					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRepairBackEfastOrderId());
 					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
+					if(efastOrder == null){
+						return;
+					}
 					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
 						re.setRepairSendName(efastOrder.getOrderAddressName());
 						re.setRepairSendTel(efastOrder.getOrderAddressTel());
 						//查询省市县id
-						Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
+						/*Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
 						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
 						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
-						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));
-						re.setRepairSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));
-						re.setRepairSendAddress(efastOrder.getOrderAddress());
+						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));*/
+						/*re.setRepairSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));*/
+						/*re.setRepairSendAddress(efastOrder.getOrderAddress());*/
 						re.setRepairSendLogisticsCompany(efastOrder.getOrderPostFirm());
 						re.setRepairSendLogisticsNo(efastOrder.getOrderPostNum());
-						re.setRepairSendStatus(2);
+						/*re.setRepairSendStatus(2);*/
 						Integer msg = repairService.updateRepairInfo(re,null,null);
 						if(msg > 0){
 							//发送维修发货通知短信
 							sendSMS("<维修业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getRepairBackTel());
 						}
 					}
-				}
 
 			}
 		}
 
 		/*同步换货订单*/
 		Renewed renewed = new Renewed();
-		renewed.setRenewedSendStatus(1);
 		List<Renewed> listRenewed = renewedService.listSynchronizingRenewed(renewed);
 		if(listRenewed.size() > 0){
 			for(Renewed re:listRenewed){
-				if(re.getSalesDealCode() != null){
 					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getRenewedBackEfastOrderId());
 					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
+					if(efastOrder == null){
+						return;
+					}
 					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
 						re.setRenewedSendName(efastOrder.getOrderAddressName());
 						re.setRenewedSendTel(efastOrder.getOrderAddressTel());
-						//查询省市县id
+						/*//查询省市县id
 						Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
 						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
 						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
 						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));
 						re.setRenewedSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));
-						re.setRenewedSendAddress(efastOrder.getOrderAddress());
+						re.setRenewedSendAddress(efastOrder.getOrderAddress());*/
 						re.setRenewedSendLogisticsCompany(efastOrder.getOrderPostFirm());
 						re.setRenewedSendLogisticsNo(efastOrder.getOrderPostNum());
-						re.setRenewedSendStatus(2);
+						/*re.setRenewedSendStatus(2);*/
 						Integer msg = renewedService.updateRenewedInfo(re,null,null);
 						if(msg > 0){
 							//发送换货发货通知短信
 							sendSMS("<换货业务>",efastOrder.getOrderPostFirm(),efastOrder.getOrderPostNum(),re.getCustomerId(),re.getRenewedBackTel());
 						}
 					}
-				}
 			}
 		}
 		/*同步补发订单*/
 		Reissue reissue = new Reissue();
-		reissue.setReissueSendStatus(1);
 		List<Reissue> listReissue = reissueService.listSynchronizingReissue(reissue);
 		if(listReissue.size() > 0){
 			for(Reissue re:listReissue){
-				if(re.getSalesDealCode() != null){
 					JSONObject respData = efastOrderService.getOrderFormEfastByOrderId(re.getReissueBackEfastOrderId());
 					EfastOrder efastOrder = efastUtil.respDataConversion(respData);
+					if(efastOrder == null){
+						return;
+					}
 					if (efastOrder.getOrderStatus() == 1){//1代表已发货  发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
 						re.setReissueSendName(efastOrder.getOrderAddressName());
 						re.setReissueSendTel(efastOrder.getOrderAddressTel());
-						//查询省市县id
+						/*//查询省市县id
 						Map<String,String> pccMap = provincesCitiesCounties(efastOrder);
 						re.setProvinceNumber(Integer.valueOf(pccMap.get("provinceId")));
 						re.setCityNumber(Integer.valueOf(pccMap.get("cityId")));
 						re.setAreaNumber(Integer.valueOf(pccMap.get("districtId")));
 						re.setReissueSendMergeAddress(pccMap.get("province")+"-"+pccMap.get("city")+"-"+pccMap.get("district"));
-						re.setReissueSendAddress(efastOrder.getOrderAddress());
+						re.setReissueSendAddress(efastOrder.getOrderAddress());*/
 						re.setReissueSendLogisticsCompany(efastOrder.getOrderPostFirm());
 						re.setReissueSendLogisticsNo(efastOrder.getOrderPostNum());
-						re.setReissueSendStatus(2);
+						/*re.setReissueSendStatus(2);*/
 						Integer msg = reissueService.updateReissueInfo(re);
 						if(msg > 0){
 							//发送补发发货通知短信
@@ -335,8 +337,6 @@ public class MQTask implements InitializingBean {
 
 						}
 					}
-				}
-
 			}
 		}
 	}

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

@@ -22,15 +22,18 @@ public class EfastUtil {
         if(respData == null){
             return null;
         }
+        if(respData.size() == 2){
+            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 province = respData.getString("province");//省
         String city = respData.getString("city");//市
-        String district = respData.getString("district");//区
+        String district = respData.getString("district");//区*/
         String invoice_no = respData.getString("invoice_no");//快递单号
         String shipping_name = respData.getString("shipping_name");//快递公司
 
@@ -49,12 +52,12 @@ public class EfastUtil {
             efastOrder.setOrderAddressName(consignee);
             efastOrder.setOrderAddress(address);
             efastOrder.setOrderAddressTel(mobile);
-            efastOrder.setOrderProvince(province);
+            /*efastOrder.setOrderProvince(province);
             efastOrder.setOrderCity(city);
-            efastOrder.setOrderArea(district);
+            efastOrder.setOrderArea(district);*/
             efastOrder.setOrderPostNum(invoice_no);
             efastOrder.setOrderPostFirm(shipping_name);
-            efastOrder.setRepairSendMergeAddress(province + "-" + city + "-" + district);
+            efastOrder.setRepairSendMergeAddress(address);
             efastOrder.setOrderProductName(goods_name);
             efastOrder.setOrderNum(Integer.valueOf(goods_number));
             return efastOrder;

watero-rst-web/src/main/webapp/WEB-INF/views/cm/logistics/view_logistics.ftl

@@ -162,7 +162,7 @@
 <!-- <script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script> -->
 <script type="text/javascript">
     function pullupRefresh() {
-        var billCode = ${billCode!''};
+        var billCode = "${billCode!''}";
         var billName = "${billName!''}";
         mui.ajax('${path}/logistics/getExpressInfo?dates=' + new Date().getTime(), {
             data: {