修改bug文档问题

watero-rst-core/src/main/java/com.iamberry.rst.core/order/EfastOrder.java

@@ -44,6 +44,7 @@ public class EfastOrder implements Serializable{
     private String orderPostFirm;               //快递公司
     private String orderDealCode;               //交易号
     private List<EfastOrderItem> itemList;      //订单项集合
+    private Integer returnOrderType;                 //退单类型 1退货单(含退款),2退货单,3退款单可不传
 
     // 推送状态
     private String returnStatus;
@@ -265,4 +266,12 @@ public class EfastOrder implements Serializable{
     public void setPlatformOrderId(String platformOrderId) {
         this.platformOrderId = platformOrderId;
     }
+
+    public Integer getReturnOrderType() {
+        return returnOrderType;
+    }
+
+    public void setReturnOrderType(Integer returnOrderType) {
+        this.returnOrderType = returnOrderType;
+    }
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -119,7 +119,7 @@ public interface CustomerService {
      * @return
      * @throws Exception
      */
-    void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status);
+    void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status,Integer returnType);
     /**
      * 添加仓储
      * @param customerCommon

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

@@ -152,15 +152,15 @@ public class CustomerServiceImpl implements CustomerService {
             switch (customerInfo.getCustomerIsSolve()) {  //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
                 case 3: //换新
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2);    //原订单生成退单
-
-                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //换新需要向Efast推送一条换新发货的订单
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);    //原订单生成退单
+                    //在生成退单后不需要在推送新的订单
+                    /*map = customerService.sendEfastOrder(customerCommon,salesOrder);  //换新需要向Efast推送一条换新发货的订单
                     if(map.get("status") == 1){
                         customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
                         complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
                     }else{
                         throw new RuntimeException("换新创建Efast订单失败");
-                    }
+                    }*/
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
                     complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
@@ -168,15 +168,15 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
                 case 4: //维修
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2);    //原订单生成退单
-
-                    map = customerService.sendEfastOrder(customerCommon,salesOrder);  //维修需要向Efast推送一条维修发货的订单
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);    //原订单生成退单
+                    //在生成退单后不需要在推送新的订单
+                    /*map = customerService.sendEfastOrder(customerCommon,salesOrder);  //维修需要向Efast推送一条维修发货的订单
                     if(map.get("status") == 1){
                         customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));  //存放Efast订单编号
                         complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));     //仓储签收表添加  发货的Efast订单id
                     }else{
                         throw new RuntimeException("维修创建Efast订单失败");
-                    }
+                    }*/
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
                     complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId()); //设置仓储签收id
@@ -193,7 +193,7 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
                 case 6: //退货
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);    //原订单生成退单
 
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
@@ -202,7 +202,7 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
                 case 7: //无理由退货
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);    //原订单生成退单
 
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
@@ -341,7 +341,7 @@ public class CustomerServiceImpl implements CustomerService {
             boolean isReturn = false;
             switch (customerInfo.getCustomerIsSolve()) {  //处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
                 case 3: //换新
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2);    //原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);    //原订单生成退单
 
                     map = customerService.sendEfastOrder(customerCommon,salesOrder);  //换新需要向Efast推送一条换新发货的订单
                     if(map.get("status") == 1){
@@ -357,7 +357,7 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
                 case 4: //维修
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2);    //原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);    //原订单生成退单
 
                     map = customerService.sendEfastOrder(customerCommon,salesOrder);  //维修需要向Efast推送一条维修发货的订单
                     if(map.get("status") == 1){
@@ -382,7 +382,7 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
                 case 6: //退货
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);    //原订单生成退单
 
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
@@ -391,7 +391,7 @@ public class CustomerServiceImpl implements CustomerService {
                     break;
                 case 7: //无理由退货
 
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3);    //原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);    //原订单生成退单
 
                     complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());    //原有订单的Efast的订单编号
                     customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);//创建仓储任务
@@ -502,7 +502,7 @@ public class CustomerServiceImpl implements CustomerService {
                     record.setRelationId(renewed.getRenewedId());
                     customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(record));
                     customerService.setName(customerCommon);
-                    customerService.chargebackEfastOrder(customerCommon,salesOrder,8);
+                    customerService.chargebackEfastOrder(customerCommon,salesOrder,8,2);
                 }
                 //删除寄出寄回产品
                 closedRecord.setRelationId(renewed.getRenewedId());
@@ -528,7 +528,7 @@ public class CustomerServiceImpl implements CustomerService {
                     record.setRelationId(repair.getRepairId());
                     customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(record));
                     customerService.setName(customerCommon);
-                    customerService.chargebackEfastOrder(customerCommon, salesOrder, 8);    //从维修换货补发修改为已解决或未解决时，原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon, salesOrder, 8,2);    //从维修换货补发修改为已解决或未解决时，原订单生成退单
                 }
                 //删除寄出寄回产品
                 closedRecord.setRelationId(repair.getRepairId());
@@ -554,7 +554,7 @@ public class CustomerServiceImpl implements CustomerService {
                     record.setRelationId(reissue.getReissueId());
                     customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(record));
                     customerService.setName(customerCommon);
-                    customerService.chargebackEfastOrder(customerCommon, salesOrder, 8);    //从维修换货补发修改为已解决或未解决时，原订单生成退单
+                    customerService.chargebackEfastOrder(customerCommon, salesOrder, 8,2);    //从维修换货补发修改为已解决或未解决时，原订单生成退单
                 }
                 //删除寄出产品
                 sendProdcue.setRelationId(reissue.getReissueId());
@@ -959,7 +959,7 @@ public class CustomerServiceImpl implements CustomerService {
      * @throws RuntimeException
      */
     @Transactional
-    public void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status){
+    public void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status,Integer returnType){
 
         SalesOrder order = new SalesOrder();
         order.setSalesId(salesOrder.getSalesId());
@@ -984,7 +984,7 @@ public class CustomerServiceImpl implements CustomerService {
         efastOrder.setOrderPostNum(salesOrder.getSalesPostNum()); //物流单号
         efastOrder.setOrderId(salesOrder.getSalesOrderId());        //订单编号
         efastOrder.setItemList(itemList);
-
+        efastOrder.setReturnOrderType(returnType);//退单类型
         JSONObject jsonObject = new JSONObject();
         try{
             jsonObject = efastOrderService.returnOrderFormEfast(efastOrder);

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

@@ -522,6 +522,9 @@ public class EfastOrderServiceImpl implements EfastOrderService {
             String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
             resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
             resultJson = resultJson.replaceAll("[\\t\\n\\r]", "");
+            if (resultJson.indexOf("江西省 南昌市 新建县 \"江西南昌市新建县县城内江西南昌新建县黄家湖东路1666号众森红谷一品45栋2单元601室")!=-1){
+                resultJson = resultJson.replace("江西省 南昌市 新建县 \"江西南昌市新建县县城内江西南昌新建县黄家湖东路1666号众森红谷一品45栋2单元601室","江西南昌市新建县县城内江西南昌新建县黄家湖东路1666号众森红谷一品45栋2单元601室");
+            }
             JSONObject jsonObject = JSONObject.fromObject(resultJson);
             // default HTTP SUCCESS
             JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
@@ -602,7 +605,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
         Map<String, String> requestData = new HashMap<String, String>();
         requestData.put("return_shipping_name", efastOrder.getOrderPostFirm());		// 退单物流代码
         requestData.put("kehu_return_invoice_no", efastOrder.getOrderPostNum());	// 退单物流单号
-        requestData.put("return_type", "2");
+        requestData.put("return_type", efastOrder.getReturnOrderType().toString());//退单类型 1退货单(含退款),2退货单,3退款单可不传
         requestData.put("app_nick", NameUtils.getConfig("app_nick"));
         requestData.put("app_key", NameUtils.getConfig("app_key"));
         requestData.put("app_secret", NameUtils.getConfig("app_secret"));

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_detail.ftl

@@ -201,6 +201,7 @@
             <label class="form-label col-1 col-sm-1">快递公司：</label>
             <div class="formControls col-4 col-sm-4">
                 <label>
+                <#if order.salesPostFirm??>
                     <#if order.salesPostFirm == 'sto'>
                         申通快递
                     <#elseif order.salesPostFirm == 'yto'>
@@ -231,7 +232,10 @@
                         其他
                     <#elseif order.salesPostFirm == '02'>
                         上门送货
+                    <#elseif order.salesPostFirm == 'eyb'>
+                        E邮宝
                     </#if>
+                </#if>
                 </label>
             </div>
             <label class="form-label col-1 col-sm-1">快递单号：</label>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -138,6 +138,8 @@
                                 其他
                             <#elseif order.salesPostFirm == '02'>
                                 上门送货
+                            <#elseif order.salesPostFirm == 'eyb'>
+                                E邮宝
                             </#if>
                         </#if>
                     </td>