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

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

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

@@ -47,6 +47,88 @@ public class CustomerInfo  implements Serializable {
     //  问题标题
     private String customerQuestionTitle;
 
+    private String productName;         //客诉产品
+    private String complaintClassName;  //客诉类型名称
+    private String smallClassName;      //客诉小类名称
+    private String describeTitle;       //客诉问题标题
+    private String companyName;         //销售公司名称
+    private String storeName;           //店铺名称
+    private Integer detectState;        //检测状态
+    private Integer typeId;             //产品类型
+    private String typeName;            //产品类型名称
+
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getComplaintClassName() {
+        return complaintClassName;
+    }
+
+    public void setComplaintClassName(String complaintClassName) {
+        this.complaintClassName = complaintClassName;
+    }
+
+    public String getSmallClassName() {
+        return smallClassName;
+    }
+
+    public void setSmallClassName(String smallClassName) {
+        this.smallClassName = smallClassName;
+    }
+
+    public String getDescribeTitle() {
+        return describeTitle;
+    }
+
+    public void setDescribeTitle(String describeTitle) {
+        this.describeTitle = describeTitle;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public Integer getDetectState() {
+        return detectState;
+    }
+
+    public void setDetectState(Integer detectState) {
+        this.detectState = detectState;
+    }
+
     public Integer getCustomerId() {
         return customerId;
     }

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

@@ -1,5 +1,8 @@
 package com.iamberry.rst.core.cm;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Date;
@@ -18,7 +21,7 @@ public class SalesOrder implements Serializable {
     private Integer salesDiscountMoney;     //优惠金额
     private Integer salesPledgeMoney;       //押金金额
     private Integer salesRemainDeposit;     //待提取金额
-    private Integer salesStatus;            //订单状态
+    private Integer salesStatus;            //确认状态
     private Integer salesSendType;          //送货方式
     private Date salesSendTime;             //发货时间
     private Date salesSalesTime;            //订购时间
@@ -34,6 +37,8 @@ public class SalesOrder implements Serializable {
     private Integer salesLastMoney;         //本次支付金额
     private Integer salesShippingFee;       //邮费
     private Date salesPayTime;              //支付时间
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date salesCreateTime;           //创建时间
     private String salesAdminRemark;        //后台的备注
     private String salesUserRemark;         //用户备注
@@ -41,12 +46,85 @@ public class SalesOrder implements Serializable {
     private Integer salesStoreId;           //店铺id
     private Integer salesCompanyId;         //销售公司id
     private Integer salesType;              //订单类型
+    private String salesDealCode;           //交易号
+    private Integer salesOrderStatus;       //订单状态
+    private Integer salesShippingStatus;    //发货状态
+    private Integer salesPayStatus;         //付款状态
+    private Integer salesProcessStatus;     //单据状态
+    private Integer salesIsSend;            //是否通知配货
+    private Integer salesIsLocked;          //是否锁定
+    private Integer salesIsSeparate;        //是否缺货
+
 
     private String companyName;             //销售公司名称
     private String storeName;               //店铺名称
 
     private List<SalesOrderItem> salesOrderItemList = new ArrayList<SalesOrderItem>();
 
+    public String getSalesDealCode() {
+        return salesDealCode;
+    }
+
+    public void setSalesDealCode(String salesDealCode) {
+        this.salesDealCode = salesDealCode;
+    }
+
+    public Integer getSalesOrderStatus() {
+        return salesOrderStatus;
+    }
+
+    public void setSalesOrderStatus(Integer salesOrderStatus) {
+        this.salesOrderStatus = salesOrderStatus;
+    }
+
+    public Integer getSalesShippingStatus() {
+        return salesShippingStatus;
+    }
+
+    public void setSalesShippingStatus(Integer salesShippingStatus) {
+        this.salesShippingStatus = salesShippingStatus;
+    }
+
+    public Integer getSalesPayStatus() {
+        return salesPayStatus;
+    }
+
+    public void setSalesPayStatus(Integer salesPayStatus) {
+        this.salesPayStatus = salesPayStatus;
+    }
+
+    public Integer getSalesProcessStatus() {
+        return salesProcessStatus;
+    }
+
+    public void setSalesProcessStatus(Integer salesProcessStatus) {
+        this.salesProcessStatus = salesProcessStatus;
+    }
+
+    public Integer getSalesIsSend() {
+        return salesIsSend;
+    }
+
+    public void setSalesIsSend(Integer salesIsSend) {
+        this.salesIsSend = salesIsSend;
+    }
+
+    public Integer getSalesIsLocked() {
+        return salesIsLocked;
+    }
+
+    public void setSalesIsLocked(Integer salesIsLocked) {
+        this.salesIsLocked = salesIsLocked;
+    }
+
+    public Integer getSalesIsSeparate() {
+        return salesIsSeparate;
+    }
+
+    public void setSalesIsSeparate(Integer salesIsSeparate) {
+        this.salesIsSeparate = salesIsSeparate;
+    }
+
     public Integer getSalesId() {
         return salesId;
     }

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

@@ -48,6 +48,11 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         if (list == null || list.size() == 0) {
             return false;
         }
+        //查询该订单是否存在，如果存在，不需要再次添加到订单中
+        int count = salesOrderMapper.getOrderInfoCount(salesOrder);
+        if (count > 0) {
+            return true;
+        }
         //添加订单数据
         int orderNum = salesOrderMapper.addSalesOrder(salesOrder);
         if (orderNum <= 0) {

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

@@ -55,4 +55,11 @@ public interface SalesOrderMapper {
      * @return
      */
     Integer addOrderItemList(List<SalesOrderItem> list);
+
+    /**
+     * 根据条件查询订单数量
+     * @param salesOrder
+     * @return
+     */
+    Integer getOrderInfoCount(SalesOrder salesOrder);
 }

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

@@ -52,12 +52,7 @@
   <!-- 订单集合 -->
   <select id="listSalesOrder" resultType="SalesOrder" parameterType="SalesOrder" >
     select
-    sales_id, sales_orderId, sales_openId, sales_discount_money, sales_pledge_money,
-    sales_remain_deposit, sales_status, sales_send_type, sales_send_time, sales_sales_time,
-    sales_post_num, sales_post_firm, sales_address_info, sales_address_tel, sales_address_name,
-    sales_amount, sales_pay_money, sales_pay_type, sales_wait_money, sales_last_money,
-    sales_shipping_fee, sales_pay_time, sales_create_time, sales_admin_remark, sales_user_remark,
-    sales_pay_number, sales_store_id, sales_company_id, sales_type,
+    tb_rst_sales_order_info.*,
     trsc.company_name companyName,
     trsi.store_name  storeName
     from tb_rst_sales_order_info
@@ -125,7 +120,8 @@
       sales_wait_money, sales_last_money, sales_shipping_fee, 
       sales_pay_time, sales_create_time, sales_admin_remark, 
       sales_user_remark, sales_pay_number, sales_store_id, 
-      sales_company_id, sales_type)
+      sales_company_id, sales_type,sales_deal_code,sales_order_status,sales_shipping_status,
+      sales_pay_status,sales_process_status,sales_is_send,sales_is_locked,sales_is_separate)
     values (#{salesId,jdbcType=INTEGER}, #{salesOrderId,jdbcType=VARCHAR}, #{salesOpenId,jdbcType=VARCHAR},
       #{salesDiscountMoney,jdbcType=INTEGER}, #{salesPledgeMoney,jdbcType=INTEGER}, #{salesRemainDeposit,jdbcType=INTEGER}, 
       #{salesStatus,jdbcType=INTEGER}, #{salesSendType,jdbcType=INTEGER}, #{salesSendTime,jdbcType=TIMESTAMP}, 
@@ -135,7 +131,9 @@
       #{salesWaitMoney,jdbcType=INTEGER}, #{salesLastMoney,jdbcType=INTEGER}, #{salesShippingFee,jdbcType=INTEGER}, 
       #{salesPayTime,jdbcType=TIMESTAMP}, #{salesCreateTime,jdbcType=TIMESTAMP}, #{salesAdminRemark,jdbcType=VARCHAR},
       #{salesUserRemark,jdbcType=VARCHAR}, #{salesPayNumber,jdbcType=VARCHAR}, #{salesStoreId,jdbcType=INTEGER}, 
-      #{salesCompanyId,jdbcType=INTEGER}, #{salesType,jdbcType=INTEGER})
+      #{salesCompanyId,jdbcType=INTEGER}, #{salesType,jdbcType=INTEGER},#{salesDealCode},#{salesOrderStatus},
+      #{salesShippingStatus},#{salesPayStatus},#{salesProcessStatus},#{salesIsSend},#{salesIsLocked},
+      #{salesIsSeparate})
   </insert>
 
   <!-- 批量添加订单项数据 -->
@@ -168,7 +166,8 @@
       sales_wait_money, sales_last_money, sales_shipping_fee,
       sales_pay_time, sales_create_time, sales_admin_remark,
       sales_user_remark, sales_pay_number, sales_store_id,
-      sales_company_id, sales_type)
+      sales_company_id, sales_type,sales_deal_code,sales_order_status,sales_shipping_status,
+      sales_pay_status,sales_process_status,sales_is_send,sales_is_locked,sales_is_separate)
     values
     <foreach collection="list" item="item" separator=",">
     (
@@ -181,7 +180,9 @@
       #{item.salesWaitMoney}, #{item.salesLastMoney}, #{item.salesShippingFee},
       #{item.salesPayTime}, #{item.salesCreateTime}, #{item.salesAdminRemark},
       #{item.salesUserRemark}, #{item.salesPayNumber}, #{item.salesStoreId},
-      #{item.salesCompanyId}, #{item.salesType}
+      #{item.salesCompanyId}, #{item.salesType},#{salesDealCode},#{salesOrderStatus},
+      #{salesShippingStatus},#{salesPayStatus},#{salesProcessStatus},#{salesIsSend},#{salesIsLocked},
+      #{salesIsSeparate}
     )
     </foreach>
   </insert>

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

@@ -94,7 +94,15 @@ public class MQTask implements InitializingBean {
 		int pageNo = 1;
 		int pageSize = 20;
 		boolean flag = false;	//控制是否还需要获取百胜订单信息
-		String date = "2016-04-01";
+		String date = "";
+		//根据时间排序查询订单信息
+		List<SalesOrder> orderList = salesOrderService.listSalesOrder(new SalesOrder());
+		if (orderList != null && orderList.size() > 0) {
+			SalesOrder salesOrder = orderList.get(0);
+			date = salesOrder.getSalesCreateTime().toString();
+		} else {
+			date = "2016-04-01";
+		}
 		do {
 			//批量获取百胜订单信息
 			JSONObject obj = efastOrderService.listOrderInfoFormEfast(pageNo, pageSize,date);
@@ -139,20 +147,19 @@ public class MQTask implements InitializingBean {
 			}
 
 			SalesOrder salesOrder = new SalesOrder();
-			salesOrder.setSalesOrderId(order.getString("deal_code"));//订单编号
-			int payStatus = order.getInt("pay_status");				//是否付款 0：未付款，2：已付款
-			int orderStatus = order.getInt("order_status");			//订单状态 0：未确认，1：已确认，2：挂起，3：作废
-			int shippingStatus = order.getInt("shipping_status");	//发货状态 0：未发货，1：已发货，3：备货中
-			if (orderStatus == 2 || orderStatus == 3) {
+			salesOrder.setSalesOrderId(order.getString("order_sn"));//订单编号
+			salesOrder.setSalesDealCode(order.getString("deal_code"));//交易号
+			salesOrder.setSalesOrderStatus(1);//订单状态
+			salesOrder.setSalesShippingStatus(order.getInt("shipping_status"));//发货状态 0：未发货，1：已发货，3：备货中
+			salesOrder.setSalesPayStatus(order.getInt("pay_status"));//是否付款 0：未付款，2：已付款
+			salesOrder.setSalesProcessStatus(order.getInt("process_status"));//单据状态
+			salesOrder.setSalesIsSend(order.getInt("is_send"));//是否通知配货
+			salesOrder.setSalesIsLocked(order.getInt("is_locked"));//是否锁定
+			salesOrder.setSalesIsSeparate(order.getInt("is_separate"));//是否缺货
+			salesOrder.setSalesStatus(order.getInt("order_status"));//订单状态 0：未确认，1：已确认，2：挂起，3：作废
+			/*if (orderStatus == 2 || orderStatus == 3) {
 				continue;
-			}
-			if (payStatus == 2 && (orderStatus == 0 || orderStatus == 1)) {
-				if (shippingStatus == 0) {
-					salesOrder.setSalesStatus(2);
-				} else if (shippingStatus == 1) {
-					salesOrder.setSalesStatus(5);
-				}
-			}
+			}*/
 			salesOrder.setSalesPostFirm(order.getString("shipping_name"));//快递方式代码
 			salesOrder.setSalesPostNum(order.getString("invoice_no"));//快递单号
 			salesOrder.setSalesOpenId(order.getString("mobile"));//唯一标识