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

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/CustomerCommon.java

@@ -68,7 +68,6 @@ public class CustomerCommon implements Serializable {
     private String relationAlipay;
     //转账账户 (账户姓名)
     private String relationAlipayName;
-
     //20180327 当前邮费默认为  0 不需要
     //是否已转账邮费  0:不需要 10:需要转账
     private Integer relationIsTransfer;  //是否已转账邮费  0:不需要 1:已转  2:已申请待转账   3:未申请  -- 作废

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

@@ -116,4 +116,15 @@ public interface SalesOrderService {
      * @return
      */
     List<SalesOrder> listOrderExcel(SalesOrder salesOrder);
+
+    /**
+     * 删除订单根据Efast订单号
+     */
+    Integer delOrder(String orderId);
+
+    /**
+     * 修改订单项数量
+     */
+    Integer updateOrderItem(SalesOrderItem salesOrderItem);
+
 }

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

@@ -20,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Service
@@ -80,7 +77,6 @@ public class CustomerServiceImpl implements CustomerService {
     @Autowired
     private RelationOrderService relationOrderService;
 
-
     @Override
     public CustomerInfo getCustomerInfo(Integer customerId) {
         return customerInfoMapper.getCustomerInfo(customerId);
@@ -280,10 +276,13 @@ public class CustomerServiceImpl implements CustomerService {
                 ro.setSalesId(sor.getSalesId());
                 relationOrderList.add(ro);
             }
-            flag = relationOrderService.saveList(relationOrderList);
-            if(flag < 1){
-                throw new RuntimeException("添加客诉，关联订单失败");
+            if(relationOrderList != null && relationOrderList.size() > 0){
+                flag = relationOrderService.saveList(relationOrderList);
+                if(flag < 1){
+                    throw new RuntimeException("添加客诉，关联订单失败");
+                }
             }
+
             for (SalesOrder sor : orderList) {
                 SalesOrder newOrder = new SalesOrder(); //salesOrderStatus
                 newOrder.setSalesId(sor.getSalesId());
@@ -525,10 +524,13 @@ public class CustomerServiceImpl implements CustomerService {
                 ro.setSalesId(sor.getSalesId());
                 relationOrderList.add(ro);
             }
-            flag = relationOrderService.saveList(relationOrderList);
-            if(flag < 1){
-                throw new RuntimeException("添加客诉，关联订单失败");
+            if(relationOrderList != null && relationOrderList.size() > 0){
+                flag = relationOrderService.saveList(relationOrderList);
+                if(flag < 1){
+                    throw new RuntimeException("添加客诉，关联订单失败");
+                }
             }
+
             for (SalesOrder sor : orderList) {
                 SalesOrder newOrder = new SalesOrder(); //salesOrderStatus
                 newOrder.setSalesId(sor.getSalesId());
@@ -1289,92 +1291,37 @@ public class CustomerServiceImpl implements CustomerService {
         PageHelper.startPage(pageNO, pageSize, isTotalNum);
         //查询客诉列表
         List<CustomerInfo> customerList = customerInfoMapper.listCustomer(customerInfo);
-        //查询售后维修集合
-        Repair repairInfo = new Repair();
-        repairInfo.setRepairState(1);
-        List<Repair> repairList = repairMapper.listRepair(repairInfo);
-        //查询售后退货集合
-        BackGoods backGoodsInfo = new BackGoods();
-        backGoodsInfo.setBackGoodsState(1);
-        List<BackGoods> backGoodsList = backGoodsMapper.listBackGoods(backGoodsInfo);
-        //查询售后无理由退货集合
-        NoreasonBack noreasonBackInfo = new NoreasonBack();
-        noreasonBackInfo.setNoreasonBackState(1);
-        List<NoreasonBack> noreasonBackList = noreasonBackMapper.listNoreasonBack(noreasonBackInfo);
-        //查询售后补发集合
-        Reissue reissueInfo = new Reissue();
-        reissueInfo.setReissueState(1);
-        List<Reissue> reissueList = reissueMapper.listReissue(reissueInfo);
-        //查询售后换新集合
-        Renewed renewedInfo = new Renewed();
-        renewedInfo.setRenewedState(1);
-        List<Renewed> renewedList = renewedMapper.listRenewed(renewedInfo);
 
         if (customerList != null && customerList.size() > 0) {
             for (CustomerInfo customer : customerList) {
-                switch (customer.getCustomerIsSolve().intValue()) {
-                    case 3: //换新
-                        for (Renewed renewed : renewedList) {
-                            if (renewed.getCustomerId().intValue() == customer.getCustomerId()) {
-                                customer.setBackStatus(renewed.getRenewedBackStatus());
-                                customer.setSendStatus(renewed.getRenewedSendStatus());
-                                customer.setSalesTime(renewed.getSalesPayTime());
-                                customer.setSendLogisticsNo(renewed.getRenewedSendLogisticsNo());
-                                customer.setSendLogisticsCompany(renewed.getRenewedSendLogisticsCompany());
-                                customer.setBackLogisticsNo(renewed.getRenewedBackLogisticsNo());
-                                customer.setBackLogisticsCompany(renewed.getRenewedBackLogisticsCompany());
-                                break;
-                            }
-                        }
-                        break;
-                    case 4: //维修
-                        for (Repair repair : repairList) {
-                            if (repair.getCustomerId().intValue() == customer.getCustomerId()) {
-                                customer.setBackStatus(repair.getRepairBackStatus());
-                                customer.setSendStatus(repair.getRepairSendStatus());
-                                customer.setSalesTime(repair.getSalesPayTime());
-                                customer.setSendLogisticsNo(repair.getRepairSendLogisticsNo());
-                                customer.setSendLogisticsCompany(repair.getRepairSendLogisticsCompany());
-                                customer.setBackLogisticsNo(repair.getRepairBackLogisticsNo());
-                                customer.setBackLogisticsCompany(repair.getRepairBackLogisticsCompany());
-                                break;
-                            }
-                        }
-                        break;
-                    case 5: //补发
-                        for (Reissue reissue : reissueList) {
-                            if (reissue.getCustomerId().intValue() == customer.getCustomerId()) {
-                                customer.setSendStatus(reissue.getReissueSendStatus());
-                                customer.setSalesTime(reissue.getSalesPayTime());
-                                customer.setSendLogisticsNo(reissue.getReissueSendLogisticsNo());
-                                customer.setSendLogisticsCompany(reissue.getReissueSendLogisticsCompany());
-                                break;
-                            }
-                        }
-                        break;
-                    case 6: //退货
-                        for (BackGoods backGoods : backGoodsList) {
-                            if (backGoods.getCustomerId().intValue() == customer.getCustomerId()) {
-                                customer.setBackStatus(backGoods.getBackGoodsBackStatus());
-                                customer.setSalesTime(backGoods.getSalesPayTime());
-                                customer.setBackLogisticsNo(backGoods.getBackGoodsBackLogisticsNo());
-                                customer.setBackLogisticsCompany(backGoods.getBackGoodsBackLogisticsCompany());
-                                break;
-                            }
-                        }
-                        break;
-                    case 7: //无理由退货
-                        for (NoreasonBack noreasonBack : noreasonBackList) {
-                            if (noreasonBack.getCustomerId().intValue() == customer.getCustomerId()) {
-                                customer.setBackStatus(noreasonBack.getNoreasonBackBackStatus());
-                                customer.setSalesTime(noreasonBack.getSalesPayTime());
-                                customer.setBackLogisticsNo(noreasonBack.getNoreasonBackBackLogisticsNo());
-                                customer.setBackLogisticsCompany(noreasonBack.getNoreasonBackBackLogisticsCompany());
-                                break;
+
+                CustomerCommon customerCommon = new CustomerCommon();
+                customerCommon.setCustomerId(customer.getCustomerId());
+                List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
+                if(customerCommonList == null || customerCommonList.size() < 1){
+                    continue;
+                }
+                customerCommon = customerCommonList.get(0);
+                customer.setBackStatus(customerCommon.getRelationBackStatus());
+                customer.setSendStatus(customerCommon.getRelationSendStatus());
+                customer.setSendLogisticsNo(customerCommon.getRelationSendLogisticsNo());
+                customer.setSendLogisticsCompany(customerCommon.getRelationSendLogisticsCompany());
+                customer.setBackLogisticsNo(customerCommon.getRelationBackLogisticsNo());
+                customer.setBackLogisticsCompany(customerCommon.getRelationBackLogisticsCompany());
+                Date date = null;
+                List<SalesOrder> salesOrderList = customerCommon.getSalesOrderList();
+                if(salesOrderList != null && salesOrderList.size() > 0){
+                    for (int k = 0;k<salesOrderList.size();k++){
+                        SalesOrder so = salesOrderList.get(k);
+                        List<SalesOrderItem> salesOrderItemList = so.getSalesOrderItemList();
+                        for (SalesOrderItem soi:salesOrderItemList) {
+                            if(1 == soi.getItemIsSource()){
+                                date = so.getSalesPayTime();
                             }
                         }
-                        break;
+                    }
                 }
+                customer.setSalesTime(date);
             }
         }
         return PageUtil.getPage(customerList);
@@ -1470,22 +1417,24 @@ public class CustomerServiceImpl implements CustomerService {
         relationOrder.setRelationType(customerCommon.getCustomerIsSolve());
         relationOrder.setRelationId(customerCommon.getRelationId());
         List<RelationOrder> relationOrderList = relationOrderService.getRelationOrderList(relationOrder);
-        String[] salesIds = new String[relationOrderList.size()];
-        for (int k=0; k<relationOrderList.size();k++){
-            salesIds[k] = String.valueOf(relationOrderList.get(k).getSalesId());
-        }
-        SalesOrder so = new SalesOrder();
-        so.setSalesIds(salesIds);
-        List<SalesOrder> orderList = salesOrderMapper.listSalesOrder(so);
-        if (orderList != null && orderList.size() > 0) {
-            SalesOrder order = orderList.get(0);
-            SalesOrderItem salesOrderItem = new SalesOrderItem();
-            salesOrderItem.setItemOrderId(order.getSalesId());
-            order.setSalesOrderItemList(salesOrderMapper.listSalesOrderItem(salesOrderItem));
-        } else {
-            map.put("orderList",null);
-        }
-        map.put("orderList",orderList);
+        if(relationOrderList != null && relationOrderList.size() > 0){
+            String[] salesIds = new String[relationOrderList.size()];
+            for (int k=0; k<relationOrderList.size();k++){
+                salesIds[k] = String.valueOf(relationOrderList.get(k).getSalesId());
+            }
+            SalesOrder so = new SalesOrder();
+            so.setSalesIds(salesIds);
+            List<SalesOrder> orderList = salesOrderMapper.listSalesOrder(so);
+            if (orderList != null && orderList.size() > 0) {
+                SalesOrder order = orderList.get(0);
+                SalesOrderItem salesOrderItem = new SalesOrderItem();
+                salesOrderItem.setItemOrderId(order.getSalesId());
+                order.setSalesOrderItemList(salesOrderMapper.listSalesOrderItem(salesOrderItem));
+            } else {
+                map.put("orderList",null);
+            }
+            map.put("orderList",orderList);
+        }
         map.put("customerCommon",customerCommon);
         return map;
     }

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

@@ -317,7 +317,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 if (colorList != null && colorList.size() > 0) {
                     color = colorList.get(0);
                     item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
-                    item.setItemNum(itemJson.getInt("sn"));//商品数量
+                    item.setItemNum(itemJson.getInt("goods_number"));//商品数量
                     item.setItemCreateTime(salesOrder.getSalesCreateTime());
                     item.setItemColorId(color.getColorId());
                     item.setItemProductColor(color.getColorName());
@@ -339,7 +339,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                     }
                     fittingsInfo = Fittings.get(0);
                     item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
-                    item.setItemNum(itemJson.getInt("sn"));//商品数量
+                    item.setItemNum(itemJson.getInt("goods_number"));//商品数量
                     item.setItemCreateTime(salesOrder.getSalesCreateTime());
                     item.setItemColorId(fittingsInfo.getFittingsId());
                     item.setItemProductColor(fittingsInfo.getFittingsName());
@@ -450,7 +450,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
             if (colorList != null && colorList.size() > 0) {
                 color = colorList.get(0);
                 item.setItemColorBar(itemJson.getString("goods_barcode"));//商品69码
-                item.setItemNum(itemJson.getInt("sn"));//商品数量
+                item.setItemNum(itemJson.getInt("goods_number"));//商品数量
                 item.setItemCreateTime(salesOrder.getSalesCreateTime());
                 item.setItemColorId(color.getColorId());
                 item.setItemProductColor(color.getColorName());
@@ -472,7 +472,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 }
                 fittingsInfo = Fittings.get(0);
                 item.setItemColorBar(itemJson.getString("goods_barcode"));//商品69码
-                item.setItemNum(itemJson.getInt("sn"));//商品数量
+                item.setItemNum(itemJson.getInt("goods_number"));//商品数量
                 item.setItemCreateTime(salesOrder.getSalesCreateTime());
                 item.setItemColorId(fittingsInfo.getFittingsId());
                 item.setItemProductColor(fittingsInfo.getFittingsName());
@@ -503,4 +503,14 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public List<SalesOrder> listOrderExcel(SalesOrder salesOrder) {
         return salesOrderMapper.listOrderExcel(salesOrder);
     }
+
+    @Override
+    public Integer delOrder(String orderId) {
+        return salesOrderMapper.delOrder(orderId);
+    }
+
+    @Override
+    public Integer updateOrderItem(SalesOrderItem salesOrderItem) {
+        return salesOrderMapper.updateOrderItem(salesOrderItem);
+    }
 }

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

@@ -76,4 +76,13 @@ public interface SalesOrderMapper {
      * @return
      */
     List<SalesOrder> listOrderExcel(SalesOrder salesOrder);
+
+    /**
+     * 删除订单根据Efast订单号
+     */
+    Integer delOrder(String orderId);
+    /**
+     * 修改订单项数量
+     */
+    Integer updateOrderItem(SalesOrderItem salesOrderItem);
 }

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

@@ -399,4 +399,16 @@
     </foreach>
   </update>
 
+  <delete id="delOrder" parameterType="String">
+    DELETE FROM tb_rst_sales_order_info
+    WHERE sales_orderId = #{salesOrderId}
+  </delete>
+
+  <update id="updateOrderItem" parameterType="SalesOrderItem">
+    UPDATE tb_rst_sales_order_item
+    set
+        item_num = #{itemNum}
+    where item_order_id = #{itemOrderId}
+    AND item_color_bar = #{itemColorBar}
+  </update>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AppComplaintQuestionInfoController.java

@@ -1,12 +1,21 @@
 package com.iamberry.rst.controllers.cm;
 
-import com.iamberry.rst.core.cm.ComplaintQuestionInfo;
-import com.iamberry.rst.core.cm.CustomerCommon;
-import com.iamberry.rst.core.cm.RelationOrder;
+import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.faces.cm.ComplaintQuestionInfoService;
 import com.iamberry.rst.faces.cm.CustomerCommonService;
 import com.iamberry.rst.faces.cm.RelationOrderService;
+import com.iamberry.rst.faces.cm.SalesOrderService;
+import com.iamberry.rst.faces.order.EfastOrderService;
+import com.iamberry.rst.faces.product.ProductService;
+import com.iamberry.rst.service.cm.CustomerServiceImpl;
+import com.iamberry.rst.service.cm.mapper.FittingsInfoMapper;
+import com.iamberry.wechat.tools.DateTimeUtil;
 import com.iamberry.wechat.tools.ResponseJson;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -16,6 +25,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -24,21 +34,28 @@ import java.util.List;
  */
 @Controller
 public class AppComplaintQuestionInfoController {
+    private static Logger logger = LoggerFactory.getLogger(CustomerServiceImpl.class);
+    private Object lock = new Object();
 
     /**
      *  邮寄地址id
      */
     private Integer backOutQuestionId = 5;
 
-
     @Autowired
     private ComplaintQuestionInfoService complaintQuestionInfoService;
-
     @Autowired
     private CustomerCommonService customerCommonService;
     @Autowired
     private RelationOrderService relationOrderService;
-
+    @Autowired
+    private SalesOrderService salesOrderService;
+    @Autowired
+    private EfastOrderService efastOrderService;
+    @Autowired
+    private ProductService productService;
+    @Autowired
+    private FittingsInfoMapper fittingsInfoMapper;
 
     /**
      * 进入客诉问题描述
@@ -150,23 +167,142 @@ public class AppComplaintQuestionInfoController {
      * 处理一个客诉对应多个订单
      * @return
      */
+//    @ResponseBody
+//    @RequestMapping(value = "")
+//    public ResponseJson processCustomerOrder(HttpServletRequest request){
+//        ResponseJson msg = new ResponseJson();
+//        List<RelationOrder>  relationOrderList = new ArrayList<>();
+//        CustomerCommon customerCommon  = new CustomerCommon();
+//        List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
+//        for (int i=0; i<customerCommonList.size(); i++){
+//            RelationOrder relationOrder = new RelationOrder();
+//            relationOrder.setRelationId(customerCommonList.get(i).getRelationId());
+//            relationOrder.setRelationType(customerCommonList.get(i).getCustomerIsSolve());
+//            relationOrder.setSalesId(customerCommonList.get(i).getOrderId());
+//            relationOrderList.add(relationOrder);
+//        }
+//        relationOrderService.saveList(relationOrderList);
+//        return msg;
+//    }
+
+    /**
+     * 清理所有没有订单项的订单
+     * 并重新拉去订单
+     * @param request
+     * @return
+     */
+//    @ResponseBody
+//    @RequestMapping(value = "/delOrder")
+//    public ResponseJson processCustomerOrder(HttpServletRequest request){
+//        ResponseJson msg = new ResponseJson();
+//        List<String> orderId = new ArrayList<>();
+//        List<SalesOrder> salesOrderList = salesOrderService.listSalesOrder(new SalesOrder());
+//        for (int i=0;i<salesOrderList.size();i++){
+//            SalesOrder so = salesOrderList.get(i);
+//            SalesOrderItem soi = new SalesOrderItem();
+//            soi.setItemOrderId(so.getSalesId());
+//            List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(soi);
+//            if(salesOrderItemList == null || salesOrderItemList.size() < 1){
+//                if(so.getSalesOrderId() != null && !"".equals(so.getSalesOrderId()) ){
+//                    orderId.add(so.getSalesOrderId());
+//                    salesOrderService.delOrder(so.getSalesOrderId());
+//                }else{
+//                    System.out.println("----订单号为空--");
+//                }
+//            }
+//        }
+//        if(orderId != null && orderId.size()>0 ){
+//            System.out.println("未检测到没有产品的订单了");
+//        }
+//        System.out.println("------------------------总共有 " + orderId.size() + "订单无订单项，------------------------");
+//        StringBuffer delOrderIdError = new StringBuffer();
+//        for(Integer k=0; k<orderId.size() ; k++){
+//            String id = orderId.get(k);
+//            System.out.println("--------同步第 "+k+" 个订单，订单编号："+id+"----------");
+//            try{
+//                //获取订单详情
+//                JSONObject orderInfo = efastOrderService.getOrderFormEfastByOrderId(id);
+//                //添加订单和订单项
+//                boolean flag = true;
+//                try {
+//                    flag = salesOrderService.syncEfastOrder(orderInfo);
+//                }catch (Exception e){
+//                    return new ResponseJson(500, e.getMessage(), 500);
+//                }
+//                if (flag) {
+//                    return new ResponseJson(200, "同步成功!", 200);
+//                } else {
+//                    return new ResponseJson(500, "同步订单错误！", 500);
+//                }
+//            }catch (Exception e){
+//                e.printStackTrace();
+//                System.out.println("--------订单同步出错，订单号为：" + id);
+//                delOrderIdError.append(id+",");
+//            }
+//        }
+//        System.out.println("-----------------同步失败的id"+delOrderIdError.toString());
+//        return msg;
+//    }
+
+/**
+ * 清理所有没有订单项的订单
+ * 并重新拉去订单
+ * @param request
+ * @return
+ */
     @ResponseBody
-    @RequestMapping(value = "/c_o")
-    public ResponseJson processCustomerOrder(HttpServletRequest request){
+    @RequestMapping(value = "/synOrder")
+    public ResponseJson synCustomerOrder(HttpServletRequest request){
         ResponseJson msg = new ResponseJson();
-        List<RelationOrder>  relationOrderList = new ArrayList<>();
-        CustomerCommon customerCommon  = new CustomerCommon();
-        List<CustomerCommon> customerCommonList = customerCommonService.listCustomerCommon(customerCommon);
-        for (int i=0; i<customerCommonList.size(); i++){
-            RelationOrder relationOrder = new RelationOrder();
-            relationOrder.setRelationId(customerCommonList.get(i).getRelationId());
-            relationOrder.setRelationType(customerCommonList.get(i).getCustomerIsSolve());
-            relationOrder.setSalesId(customerCommonList.get(i).getOrderId());
-            relationOrderList.add(relationOrder);
+            List<SalesOrder> salesOrderList = salesOrderService.listSalesOrder(new SalesOrder());
+            for (int i=0;i<salesOrderList.size();i++){
+                SalesOrder so = salesOrderList.get(i);
+                SalesOrderItem soi = new SalesOrderItem();
+                soi.setItemOrderId(so.getSalesId());
+            List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(soi);
+            if(salesOrderItemList != null && salesOrderItemList.size() > 1){
+               if(so.getSalesDealCode() != null && !"".equals(so.getSalesDealCode()) ){
+                   //获取订单详情
+                   JSONObject orderInfo = null;
+                   try{
+                       orderInfo = efastOrderService.getOrderFormEfast(so.getSalesDealCode());
+                   }catch (Exception e){
+                       logger.info("获取订单失败；异常编号：505;失败原因："+ e.getMessage() +"--获取失败交易号：" + so.getSalesDealCode()+"订单id"+so.getSalesId());
+                   }
+                   if (orderInfo == null) {
+                       logger.info("1获取订单失败；异常编号：--获取失败交易号：" + so.getSalesDealCode()+"订单id"+so.getSalesId());
+                       continue;
+                   }
+                   if (!orderInfo.has("orders")) {
+                       logger.info("2获取订单失败；异常编号：--获取失败交易号：" + so.getSalesDealCode()+"订单id"+so.getSalesId());
+                       continue;
+                   }
+                   //获取订单项集合
+                   JSONArray itemArray = null;
+                   try{
+                       itemArray = orderInfo.getJSONArray("orders");
+                   }catch (Exception e){
+                       e.printStackTrace();
+                       logger.info("1解析订单项失败"+so.getSalesId());
+                   }
+                   if (itemArray == null || itemArray.size() == 0) {
+                       logger.info("2解析订单项失败"+so.getSalesId());
+                       continue;
+                   }
+                   for (int j = 0;j < itemArray.size();j++) {
+                       JSONObject itemJson = itemArray.getJSONObject(j);
+                       SalesOrderItem item = new SalesOrderItem();
+                       item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
+                       item.setItemNum(itemJson.getInt("goods_number"));//商品数量
+                       item.setItemOrderId(so.getSalesId());
+                       salesOrderService.updateOrderItem(item);
+                   }
+                }else{
+                   logger.info("----交易号为空--订单id为"+so.getSalesId());
+                }
+            }
         }
-        relationOrderService.saveList(relationOrderList);
+
         return msg;
     }
-
-
 }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_detail.ftl

@@ -99,6 +99,12 @@
             </div>
         </div>
         <div class="row cl">
+            <label class="form-label col-1 col-sm-1">备注信息：</label>
+            <div class="formControls col-5 col-sm-5">
+                <label id="customerDesc"></label>
+            </div>
+        </div>
+        <div class="row cl">
             <label class="form-label col-1 col-sm-1">用户信息：</label>
             <div class="formControls col-5 col-sm-5" style="margin-top: 2px;">
                 <label id="customerName"></label>
@@ -130,10 +136,10 @@
                     </ul>
                 </div>
             </div>
-            <div class="row cl">
+            <div class="row cl" id="tableHtml">
                 <label class="form-label col-1 col-sm-1">订单信息：</label>
                 <div class="formControls col-9 col-sm-9 text-c">
-                    <table class="table table-border table-bg table-bordered">
+                    <table class="table table-border table-bg table-bordered" >
                         <thead>
                             <tr>
                                 <th>销售</th>
@@ -155,6 +161,7 @@
                                 <td id="salesPayMoney"></td>
                                 <td id="salesItem"></td>
                                 <td id="salesPayTime"></td>
+                                <td id=""></td>
                             </tr>
                         </tbody>
                     </table>
@@ -304,6 +311,7 @@
                     $('#describeTitle').html(customer.describeTitle);
                     $('#questionProfile').html(customer.describeHandleDesc);
                     $('#describeContent').html(customer.describeContent);
+                    $('#customerDesc').html(customer.customerDesc);
                     $('#customerName').html(customer.customerName);
                     $('#customerTel').html(customer.customerTel);
                     var txtcustomerIsSolve = '';
@@ -325,25 +333,28 @@
                     $('#customerIsSolve').html(txtcustomerIsSolve);
 //                    $('#companyName').html(convertUndefinedToEmpty(customer.companyName)+"-"+convertUndefinedToEmpty(customer.storeName));
 
-
-                    var salesOrderHtml = "";
-                    $.each(orderList,function(index,item){
-                        var itemHtml = "";
-                        $.each(this.salesOrderItemList,function(index,item){
-                            itemHtml = this.itemProductName + '*' + this.itemNum
+                    if(orderList != null && typeof(orderList)!="" &&  orderList.length > 0 ){
+                        var salesOrderHtml = "";
+                        $.each(orderList,function(index,item){
+                            var itemHtml = "";
+                            $.each(this.salesOrderItemList,function(index,item){
+                                itemHtml = this.itemProductName + '*' + this.itemNum
+                            })
+                            salesOrderHtml += '<tr>'
+                                    + '<td id="">'+ convertUndefinedToEmpty(customer.companyName)+"-"+convertUndefinedToEmpty(customer.storeName) +'</td>'
+                                    + '<td id="">'+ this.salesOrderId +'</td>'
+                                    + '<td id="">'+ this.salesAddressName +'</td>'
+                                    + '<td id="">'+ this.salesAddressTel +'</td>'
+                                    + '<td id="">'+ this.salesPayMoney/100 +'</td>'
+                                    + '<td id="">'+ itemHtml +'</td>'
+                                    + '<td id="">'+ this.salesPayTime +'</td>'
+                                    + '<td id="">'+ this.salesAddressInfo +'</td>'
+                                    + '</tr>';
                         })
-                        salesOrderHtml += '<tr>'
-                            + '<td id="">'+ convertUndefinedToEmpty(customer.companyName)+"-"+convertUndefinedToEmpty(customer.storeName) +'</td>'
-                            + '<td id="">'+ this.salesOrderId +'</td>'
-                            + '<td id="">'+ this.salesAddressName +'</td>'
-                            + '<td id="">'+ this.salesAddressTel +'</td>'
-                            + '<td id="">'+ this.salesPayMoney/100 +'</td>'
-                            + '<td id="">'+ itemHtml +'</td>'
-                            + '<td id="">'+ this.salesPayTime +'</td>'
-                            + '<td id="">'+ this.salesAddressInfo +'</td>'
-                            + '</tr>';
-                    })
-                    $("#salesOrderHtml").html(salesOrderHtml);
+                        $("#salesOrderHtml").html(salesOrderHtml);
+                    }else{
+                        $("#tableHtml").hide();
+                    }
 
 //                    $('#salesOrderId').html(salesOrder.salesOrderId);
 //                    $('#salesAddressName').html(salesOrder.salesAddressName);

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_back_goods.ftl

@@ -153,23 +153,22 @@
                         <input type="radio" id="tel-6" name="backGoodsIsTransfer" value="0" seleType="postage">
                         <label for="tel-6">不需要转账</label>
                     </div>
-                    <div class="radio-box">
+                   <#-- <div class="radio-box">
                         <input type="radio" id="tel-10" name="backGoodsIsTransfer" value="10" seleType="postage">
                         <label for="tel-10">需要转账</label>
+                    </div>-->
+                    <div class="radio-box">
+                        <input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1" seleType="postage">
+                        <label for="tel-7">已转账</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2" seleType="postage">
+                        <label for="tel-8">已申请待转账</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-9" name="backGoodsIsTransfer" value="3" seleType="postage">
+                        <label for="tel-9">未申请</label>
                     </div>
-                    <#--<div class="radio-box">-->
-                        <#--<input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1" seleType="postage">-->
-                        <#--<label for="tel-7">已转账</label>-->
-                    <#--</div>-->
-                    <#--<div class="radio-box">-->
-                        <#--<input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2" seleType="postage">-->
-                        <#--<label for="tel-8">已申请待转账</label>-->
-                    <#--</div>-->
-                    <#--<div class="radio-box">-->
-                        <#--<input type="radio" id="tel-9" name="backGoodsIsTransfer" value="3" seleType="postage">-->
-                        <#--<label for="tel-9">未申请</label>-->
-                    <#--</div>-->
-
                 </div>
             </div>
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_noreason_back.ftl

@@ -139,22 +139,22 @@
                             <input type="radio" id="tel-6" name="noreasonBackIsTransfer" value="0" seleType="postage">
                             <label for="tel-6">不需要转账</label>
                         </div>
-                        <div class="radio-box">
-                            <input type="radio" id="tel-10" name="noreasonBackIsTransfer" value="10" seleType="postage">
-                            <label for="tel-10">需要转账</label>
-                        </div>
-                        <#--<div class="radio-box">-->
-                            <#--<input type="radio" id="tel-7" name="noreasonBackIsTransfer" value="1" seleType="postage">-->
-                            <#--<label for="tel-7">已转账</label>-->
-                        <#--</div>-->
-                        <#--<div class="radio-box">-->
-                            <#--<input type="radio" id="tel-8" name="noreasonBackIsTransfer" value="2" seleType="postage">-->
-                            <#--<label for="tel-8">已申请待转账</label>-->
-                        <#--</div>-->
                         <#--<div class="radio-box">-->
-                            <#--<input type="radio" id="tel-9" name="noreasonBackIsTransfer" value="3" seleType="postage">-->
-                            <#--<label for="tel-9">未申请</label>-->
+                            <#--<input type="radio" id="tel-10" name="noreasonBackIsTransfer" value="10" seleType="postage">-->
+                            <#--<label for="tel-10">需要转账</label>-->
                         <#--</div>-->
+                        <div class="radio-box">
+                            <input type="radio" id="tel-7" name="noreasonBackIsTransfer" value="1" seleType="postage">
+                            <label for="tel-7">已转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-8" name="noreasonBackIsTransfer" value="2" seleType="postage">
+                            <label for="tel-8">已申请待转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-9" name="noreasonBackIsTransfer" value="3" seleType="postage">
+                            <label for="tel-9">未申请</label>
+                        </div>
                     </div>
                 </div>
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_renewed.ftl

@@ -155,22 +155,22 @@
                         <input type="radio" id="tel-6" name="renewedIsTransfer" value="0" seleType="postage">
                         <label for="tel-6">不需要转账</label>
                     </div>
-                    <div class="radio-box">
-                        <input type="radio" id="tel-10" name="renewedIsTransfer" value="10" seleType="postage">
-                        <label for="tel-10">需要转账</label>
-                    </div>
-                    <#--<div class="radio-box">-->
-                        <#--<input type="radio" id="tel-7" name="renewedIsTransfer" value="1" seleType="postage">-->
-                        <#--<label for="tel-7">已转账</label>-->
-                    <#--</div>-->
-                    <#--<div class="radio-box">-->
-                        <#--<input type="radio" id="tel-8" name="renewedIsTransfer" value="2" seleType="postage">-->
-                        <#--<label for="tel-8">已申请待转账</label>-->
-                    <#--</div>-->
                     <#--<div class="radio-box">-->
-                        <#--<input type="radio" id="tel-9" name="renewedIsTransfer" value="3" seleType="postage">-->
-                        <#--<label for="tel-9">未申请</label>-->
+                        <#--<input type="radio" id="tel-10" name="renewedIsTransfer" value="10" seleType="postage">-->
+                        <#--<label for="tel-10">需要转账</label>-->
                     <#--</div>-->
+                    <div class="radio-box">
+                        <input type="radio" id="tel-7" name="renewedIsTransfer" value="1" seleType="postage">
+                        <label for="tel-7">已转账</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-8" name="renewedIsTransfer" value="2" seleType="postage">
+                        <label for="tel-8">已申请待转账</label>
+                    </div>
+                    <div class="radio-box">
+                        <input type="radio" id="tel-9" name="renewedIsTransfer" value="3" seleType="postage">
+                        <label for="tel-9">未申请</label>
+                    </div>
                 </div>
             </div>
             <div class="row cl" id="postageInformation">
@@ -890,16 +890,16 @@
                     renewed_flag = false;
                     return renewed_flag;
                 }
-                if (!money.test(renewedAlipay)) {
-                    layer.msg("支付宝账户格式不正确，请重新输入!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
-                }
-                if (renewedAlipayName == null || renewedAlipayName == '') {
-                    layer.msg("支付宝姓名不能为空，请重新输入!",{icon: 5,time:1000});
-                    renewed_flag = false;
-                    return renewed_flag;
-                }
+//                if (!money.test(renewedAlipay)) {
+//                    layer.msg("支付宝账户格式不正确，请重新输入!",{icon: 5,time:1000});
+//                    renewed_flag = false;
+//                    return renewed_flag;
+//                }
+//                if (renewedAlipayName == null || renewedAlipayName == '') {
+//                    layer.msg("支付宝姓名不能为空，请重新输入!",{icon: 5,time:1000});
+//                    renewed_flag = false;
+//                    return renewed_flag;
+//                }
             }
         }else if(type == 3){
             var renewedSendStatus = $('input[name="renewedSendStatus"]:checked').val();//寄回状态

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_repair.ftl

@@ -156,22 +156,22 @@
                             <input type="radio" id="tel-6" name="repairIsTransfer" value="0" seleType="postage">
                             <label for="tel-6">不需要转账</label>
                         </div>
-                        <div class="radio-box">
-                            <input type="radio" id="tel-10" name="repairIsTransfer" value="10" seleType="postage">
-                            <label for="tel-10">需要转账</label>
-                        </div>
-                        <#--<div class="radio-box">-->
-                            <#--<input type="radio" id="tel-7" name="repairIsTransfer" value="1" seleType="postage">-->
-                            <#--<label for="tel-7">已转账</label>-->
-                        <#--</div>-->
-                        <#--<div class="radio-box">-->
-                            <#--<input type="radio" id="tel-8" name="repairIsTransfer" value="2" seleType="postage">-->
-                            <#--<label for="tel-8">已申请待转账</label>-->
-                        <#--</div>-->
                         <#--<div class="radio-box">-->
-                            <#--<input type="radio" id="tel-9" name="repairIsTransfer" value="3" seleType="postage">-->
-                            <#--<label for="tel-9">未申请</label>-->
+                            <#--<input type="radio" id="tel-10" name="repairIsTransfer" value="10" seleType="postage">-->
+                            <#--<label for="tel-10">需要转账</label>-->
                         <#--</div>-->
+                        <div class="radio-box">
+                            <input type="radio" id="tel-7" name="repairIsTransfer" value="1" seleType="postage">
+                            <label for="tel-7">已转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-8" name="repairIsTransfer" value="2" seleType="postage">
+                            <label for="tel-8">已申请待转账</label>
+                        </div>
+                        <div class="radio-box">
+                            <input type="radio" id="tel-9" name="repairIsTransfer" value="3" seleType="postage">
+                            <label for="tel-9">未申请</label>
+                        </div>
                     </div>
                 </div>
                 <div class="row cl" id="postageInformation">

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -505,7 +505,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide(); //换新产品
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
+                $("#salesChannelsSelect").show();  //展示销售公司
                 break;
             case 4: //维修
                 result = isSolve.maintain;
@@ -526,7 +526,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();//维修产品
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
+                $("#salesChannelsSelect").show();  //展示销售公司
                 break;
             case 5://补发
                 result = isSolve.reissue;
@@ -547,7 +547,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").hide();    //邮费转账账户 -- 隐藏
                 visitByType(2); //需要回访
-                $("#salesChannelsSelect").hide();  //屏蔽销售公司
+                $("#salesChannelsSelect").show();  //展示销售公司
                 break;
             case 6: //退货
                 result = isSolve.backGoods;
@@ -568,7 +568,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
+                $("#salesChannelsSelect").show();  //展示销售公司
                 break;
             case 7://无理由退货
                 result = isSolve.noReasonBack;
@@ -589,7 +589,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
+                $("#salesChannelsSelect").show();  //展示销售公司
                 break;
             default:
                 break;
@@ -1672,6 +1672,9 @@ function addCustomerReady(){
     }else{
         var TDSArea = $("#TDSArea").find("option:selected").text();
         if(TDSArea != null && TDSArea != ""){
+            if(TDSArea == "请搜索城市"){
+                TDSArea = "";
+            }
             var area = TDSCity + "-" + TDSArea
             $("#customerArea").val(area);
         }