订单中心开发

iamberry-common-core/src/main/java/com/iamberry/wechat/core/entity/product/ProductColor.java

@@ -16,6 +16,7 @@ public class ProductColor implements java.io.Serializable {
     private Integer colorId;			//id
     private Integer colorProductId;		//所属产品id
     private String colorProductName;	//所属产品名称
+    private String colorAbbreviation;	//所属产品简称
     private String colorProductPic;		//产品介绍图
     private Integer colorProductType;	//产品类型
     private Integer productChildType;   //产品子类型
@@ -176,4 +177,12 @@ public class ProductColor implements java.io.Serializable {
     public void setCartNum(Integer cartNum) {
         this.cartNum = cartNum;
     }
+
+    public String getColorAbbreviation() {
+        return colorAbbreviation;
+    }
+
+    public void setColorAbbreviation(String colorAbbreviation) {
+        this.colorAbbreviation = colorAbbreviation;
+    }
 }

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

@@ -8,6 +8,7 @@ import java.util.Date;
  * Created by liuzhiwei on 2017/10/31.
  */
 public class SalesOrderItem implements Serializable {
+    private static final long serialVersionUID = 4585046295579749067L;
 
     private Integer itemId;             //订单项id
     private Integer itemOrderId;        //所属订单
@@ -24,6 +25,9 @@ public class SalesOrderItem implements Serializable {
     private Date itemCreateTime;        //创建时间
     private Integer itemIsSource;       //产品来源 1：产品颜色表，2：配件表
 
+    private String productAbbreviation;		//商品简称
+    private String colorAbbreviation;	//所属产品简称
+
     public Integer getItemIsSource() {
         return itemIsSource;
     }
@@ -135,4 +139,20 @@ public class SalesOrderItem implements Serializable {
     public void setItemCreateTime(Date itemCreateTime) {
         this.itemCreateTime = itemCreateTime;
     }
+
+    public String getProductAbbreviation() {
+        return productAbbreviation;
+    }
+
+    public void setProductAbbreviation(String productAbbreviation) {
+        this.productAbbreviation = productAbbreviation;
+    }
+
+    public String getColorAbbreviation() {
+        return colorAbbreviation;
+    }
+
+    public void setColorAbbreviation(String colorAbbreviation) {
+        this.colorAbbreviation = colorAbbreviation;
+    }
 }

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

@@ -218,10 +218,10 @@ public interface SalesOrderService {
 
     /**
      * 批量确认订单
-     * @param salesId
+     * @param salesOrder
      * @return
      */
-    Integer noticeDistribution(Integer salesId);
+    Integer noticeDistribution(SalesOrder salesOrder);
 
 
     /**

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

@@ -801,8 +801,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     }
 
     @Override
-    public Integer noticeDistribution(Integer salesId) {
-        return salesOrderMapper.noticeDistribution(salesId);
+    public Integer noticeDistribution(SalesOrder salesOrder) {
+        return salesOrderMapper.noticeDistribution(salesOrder);
     }
 
     @Transactional

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

@@ -179,9 +179,9 @@ public interface SalesOrderMapper {
 
     /**
      * 批量确认订单
-     * @param salesId
+     * @param salesOrder
      * @return
      */
-    Integer noticeDistribution(Integer salesId);
+    Integer noticeDistribution(SalesOrder salesOrder);
 
 }

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

@@ -146,9 +146,13 @@
             item_product_price,
             item_product_discount,
             item_is_source,
-            item_create_time
+            item_create_time,
+            pi.product_abbreviation,
+            pc.color_abbreviation
         FROM
             tb_rst_sales_order_item
+      LEFT JOIN tb_rst_product_info pi ON tb_rst_sales_order_item.item_product_id = pi.product_id
+      LEFT JOIN tb_rst_product_color pc ON tb_rst_sales_order_item.item_color_id = pc.color_id
       <where>
           <if test="itemOrderId !=null and itemOrderId !=''">
               AND item_order_id = #{itemOrderId}
@@ -783,10 +787,11 @@
     </update>
 
     <!-- 批量配货 -->
-    <update id="noticeDistribution" parameterType="Integer">
+    <update id="noticeDistribution" parameterType="SalesOrder">
         update tb_rst_sales_order_info
         SET
-          sales_shipping_status = 11
+          sales_shipping_status = #{salesShippingStatus},
+          sales_orderId = #{salesOrderId}
         WHERE
           sales_shipping_status = 0
         AND

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

@@ -908,13 +908,23 @@ public class AdminSalesOrderController {
         Integer flag = 0;
         String errorId = "";
         for (Integer salesIds:salesOrderIds) {
-            flag = salesOrderService.noticeDistribution(salesIds);
+            SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesIds);
+            if(salesOrder == null){
+                errorId  += salesIds + ",";
+                continue;
+            }
+            SalesOrder newOrder = new SalesOrder();
+            newOrder.setSalesId(salesIds);
+            newOrder.setSalesOrderId(salesOrder.getSalesDealCode());
+            newOrder.setSalesShippingStatus(11);
+            flag = salesOrderService.noticeDistribution(newOrder);
             if(flag < 1){
                 errorId  += salesIds + ",";
             }
         }
         if(errorId.length() > 0){
             rj.addResponseKeyValue("errorId",errorId);
+            logger.info("通知配货失败订单id:"+errorId);
             return rj;
         }
         rj = new ResponseJson(200, "修改成功", 200);

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

@@ -115,9 +115,16 @@ public class AwaitSendController {
         eOrderRequestData.setExpType("1");
         eOrderRequestData.setCost(0.00);
         eOrderRequestData.setOtherCost(0.0);
-        if (post.equalsIgnoreCase("DBL")) {
-            eOrderRequestData.setCustomerName("testdbl");
-        }
+//        if (post.equalsIgnoreCase("DBL")) {
+//            eOrderRequestData.setCustomerName("testdbl");
+//        }
+//        if(post.equalsIgnoreCase("sto")){ //申通
+//            eOrderRequestData.setCustomerName("2868442074");
+//        }else if(post.equalsIgnoreCase("sf")){ //顺丰
+//            eOrderRequestData.setCustomerName("7690035114");
+//        }else if(post.equalsIgnoreCase("ems")){ //EMS
+//            eOrderRequestData.setCustomerName("90000009971400");
+//        }
         // 收件人信息
         String[] addrs = salesOrderInfo.getSalesAddressInfo().split("-");
         if (addrs.length <= 3) {
@@ -145,7 +152,7 @@ public class AwaitSendController {
         List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
         for (SalesOrderItem temp : items) {
             Map<String, Object> product1 = new HashMap<String, Object>();
-            product1.put("GoodsName", temp.getItemProductName() + "(" + (temp.getItemProductColor()) + ")");
+            product1.put("GoodsName", temp.getProductAbbreviation() + "(" + (temp.getColorAbbreviation()) + ")*"+temp.getItemNum());
             product1.put("GoodsWeight", 10.0);
             Commodity.add(product1);
         }