修改客户信息

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

@@ -129,4 +129,8 @@ public interface SalesOrderService {
      */
     Integer updateOrderItem(SalesOrderItem salesOrderItem);
 
+    /**
+     * 根据外部订单号查询订单信息
+     * **/
+    SalesOrder getSalesOrderByLogistics(SalesOrder salesOrder);
 }

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

@@ -532,4 +532,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public Integer updateOrderItem(SalesOrderItem salesOrderItem) {
         return salesOrderMapper.updateOrderItem(salesOrderItem);
     }
+
+    @Override
+    public SalesOrder getSalesOrderByLogistics(SalesOrder salesOrder) {
+        return salesOrderMapper.getSalesOrderByLogistics(salesOrder);
+    }
 }

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

@@ -85,4 +85,9 @@ public interface SalesOrderMapper {
      * 修改订单项数量
      */
     Integer updateOrderItem(SalesOrderItem salesOrderItem);
+
+    /**
+     * 根据外部订单号查询订单信息
+     * **/
+    SalesOrder getSalesOrderByLogistics(SalesOrder salesOrder);
 }

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

@@ -411,4 +411,28 @@
     where item_order_id = #{itemOrderId}
     AND item_color_bar = #{itemColorBar}
   </update>
+
+
+  <!-- 根据外部商城订单号查询订单信息 -->
+  <select id="getSalesOrderByLogistics" resultType="SalesOrder" parameterType="SalesOrder" >
+    select
+    t.*,
+    trsc.company_name companyName,
+    trsi.store_efast  storeEfast,
+    trsi.store_name  storeName
+    from tb_rst_sales_order_info t
+    LEFT JOIN tb_rst_sales_company trsc ON t.sales_company_id = trsc.company_id
+    LEFT JOIN tb_rst_store_info trsi ON t.sales_store_id = trsi.store_id
+    <where>
+      <if test="salesDealCode != null">
+        sales_deal_code = #{salesDealCode}
+      </if>
+      <if test="salesOrderId != null">
+        and sales_orderId = #{salesOrderId}
+      </if>
+      <if test="salesCompanyId !=null and salesCompanyId !=''">
+        AND sales_company_id = #{salesCompanyId}
+      </if>
+    </where>
+  </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/MallOrderController.java

@@ -43,24 +43,25 @@ public class MallOrderController {
         String info =  request.getParameter("info");
         Map<String,Object> map = new HashMap<String,Object>();
         Map requstMap = (Map) JSON.parse(info);
-        if(requstMap == null ){
+        if(requstMap == null || requstMap.size() == 0){
             map.put("msg","parameter error");
             map.put("oder_sn",new Date().getTime());
             return JSONObject.fromObject(map);
         }
         String app_act =  request.getParameter("app_act");
-        if(app_act != null && app_act.equals("")){
+        if(app_act == null || app_act.equals("")){
             map.put("msg","parameter error");
             map.put("oder_sn",new Date().getTime());
             return JSONObject.fromObject(map);
         }
         switch (app_act){
             case "rst.trade.new.add":
-                addOrder(requstMap);
+                map = addOrder(requstMap);
                 //新增订单
                 break;
             case "rst.trade.logistics.get":
                 //拉取物流
+                map = getOrderLogistics(requstMap);
                 break;
             default:
                 map.put("msg","parameter error");
@@ -120,18 +121,13 @@ public class MallOrderController {
                  productColor.setColorBar(outer_sku);
                  //根据sku查询产品详细信息
                  List<ProductColor> listColor = productService.listproductAndColor(productColor);
-                 if(listColor.size() < 1){
-                     map.put("msg","parameter error");
-                     map.put("oder_sn",new Date().getTime());
-                     return map;
-                 }
                  SalesOrderItem salesOrderItem = new SalesOrderItem();
-                 productColor = listColor.get(0);
                  salesOrderItem.setItemNum(Integer.valueOf(orderItem.get("goods_number").toString()));
                  salesOrderItem.setItemProductName(orderItem.get("goods_name").toString());
-                 salesOrderItem.setItemColorId(productColor.getColorId());
                  if (listColor.size() > 0) {
+                    productColor = listColor.get(0);
                     Product product = productService.getProductById(listColor.get(0).getColorId());
+                    salesOrderItem.setItemColorId(productColor.getColorId());
                     salesOrderItem.setItemProductId(product.getProductId());
                     salesOrderItem.setItemProductType(product.getProductType());
                     /*salesOrderItem.setItemProductName(product.getProductName());*/
@@ -142,7 +138,7 @@ public class MallOrderController {
                     salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
                     salesOrderItem.setItemIsSource(1);
                     salesAmount += productColor.getColorDiscount();
-                } else if (listColor.size() > 0) {
+                } else if (listColor.size() == 0) {
                      FittingsInfo fittingsInfo = new FittingsInfo();
                      fittingsInfo.setFittingsBar(outer_sku);
                      fittingsInfo =  productService.getFittingsBySku(fittingsInfo);
@@ -153,6 +149,8 @@ public class MallOrderController {
                      }
                     Product product = productService.getProductByFittingsId(fittingsInfo.getProductId());
                     salesOrderItem.setItemProductType(product.getProductType());
+                    salesOrderItem.setItemColorId(fittingsInfo.getFittingsId());
+                    salesOrderItem.setItemProductId(product.getProductId());
                     /*salesOrderItem.setItemProductName(product.getProductName());*/
                     salesOrderItem.setItemProductColor(fittingsInfo.getFittingsName());
                     salesOrderItem.setItemColorBar(fittingsInfo.getFittingsBar());
@@ -206,13 +204,13 @@ public class MallOrderController {
 
         //添加订单数据
         boolean bl = false;
-        try {
+        /*try {*/
             bl = salesOrderService.addRstOrderAndIteminfo(salesOrder,salesOrder.getSalesOrderItemList());
-        }catch (Exception e){
-            map.put("msg","add error");
+        /*}catch (Exception e){
+                map.put("msg","add error");
             map.put("oder_sn",new Date().getTime());
             throw new RuntimeException("系统添加订单失败,回滚订单");
-        }
+        }*/
         if (!bl) {
             map.put("msg","add error");
             map.put("oder_sn",new Date().getTime());
@@ -222,4 +220,31 @@ public class MallOrderController {
         }
         return map;
     }
+
+    private Map<String,Object> getOrderLogistics(Map<String,Object> requstMap){
+        Map<String,Object> map = new HashMap<String,Object>();
+        SalesOrder salesOrder = new SalesOrder();
+        try {
+            String orderId = (String)requstMap.get("orderId");//订单号
+            Integer sd_id = (Integer)requstMap.get("sd_id");//店铺id
+            StoreInfo storeInfo = storeInfoService.getStoreInfoByEfastId(sd_id);
+            salesOrder.setSalesDealCode(orderId);
+            salesOrder.setSalesCompanyId(storeInfo.getCompanyId());
+            salesOrder = salesOrderService.getSalesOrderByLogistics(salesOrder);
+        }catch (Exception e){
+            map.put("msg","parameter null");
+            map.put("oder_sn",new Date().getTime());
+            return null;
+        }
+        if (salesOrder == null) {
+            map.put("msg","get error");
+            map.put("oder_sn",new Date().getTime());
+        }else{
+            map.put("msg","seccess");
+            map.put("oder_sn",new Date().getTime());
+            map.put("salesPostFirm",salesOrder.getSalesPostFirm());//快递公司
+            map.put("salesPostNum",salesOrder.getSalesPostNum());//快递单号
+        }
+        return map;
+    }
 }