添加了同步百胜订单方法

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

@@ -35,6 +35,26 @@ public class ProductColor implements Serializable {
 
     private Date colorUpdateTime;   //修改时间
 
+    private String productName;     //产品名称
+
+    private Integer productType;    //产品类型
+
+    public String getProductName() {
+        return productName;
+    }
+
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public Integer getProductType() {
+        return productType;
+    }
+
+    public void setProductType(Integer productType) {
+        this.productType = productType;
+    }
+
     public Integer getColorId() {
         return colorId;
     }

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

@@ -0,0 +1,39 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.SalesOrder;
+
+import java.util.List;
+
+/**
+ * Created by liuzhiwei on 2017/10/31.
+ */
+public interface SalesOrderService {
+
+    /**
+     * 添加订单信息
+     * @param salesOrder
+     * @return
+     */
+    Integer addSalesOrder(SalesOrder salesOrder);
+
+    /**
+     * 根据id查询订单信息
+     * @param salesId
+     * @return
+     */
+    SalesOrder getSalesOrderById(Integer salesId);
+
+    /**
+     * 修改订单信息
+     * @param salesOrder
+     * @return
+     */
+    Integer updateSalesOrder(SalesOrder salesOrder);
+
+    /**
+     * 批量添加订单信息
+     * @param list
+     * @return
+     */
+    Integer addSalesOrderList(List<SalesOrder> list);
+}

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

@@ -0,0 +1,18 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.StoreInfo;
+
+import java.util.List;
+
+/**
+ * Created by liuzhiwei on 2017/11/1.
+ */
+public interface StoreInfoService {
+
+    /**
+     * 根据条件查询店铺信息
+     * @param storeInfo
+     * @return
+     */
+    List<StoreInfo> listStore(StoreInfo storeInfo);
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/order/EfastOrderService.java

@@ -2,6 +2,7 @@ package com.iamberry.rst.faces.order;
 
 import com.iamberry.rst.core.order.EfastOrder;
 import com.iamberry.rst.core.order.OrderItem;
+import net.sf.json.JSONObject;
 
 import java.util.List;
 
@@ -41,4 +42,30 @@ public interface EfastOrderService {
      * @return
      */
     boolean invalidOrderFromEfast(String orderId) throws Exception;
+
+    /**
+     * 批量查询百胜订单数据
+     * @param pageNo
+     * @param pageSize
+     * @param date
+     * @return
+     * @throws Exception
+     */
+    JSONObject listOrderInfoFormEfast(int pageNo,int pageSize, String date) throws Exception;
+
+    /**
+     * 获取百胜订单信息
+     * @param orderid
+     * @return
+     * @throws Exception
+     */
+    JSONObject getOrderFormEfast(String orderid) throws Exception;
+
+    /**
+     * 根据百胜支付类型获取系统对应支付类型
+     * @param payName
+     * @return
+     * @throws Exception
+     */
+    int getPayType(String payName) throws Exception;
 }

watero-rst-interface/src/main/java/com/iamberry/rst/faces/product/ProductService.java

@@ -1,5 +1,6 @@
 package com.iamberry.rst.faces.product;
 
+import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.product.Gift;
 import com.iamberry.rst.core.product.OrderGift;
 
@@ -37,4 +38,11 @@ public interface ProductService {
      * @return
      */
     List<Gift> listGiftByRentType(Integer rentType);
+
+    /**
+     * 查询产品和产品颜色集合
+     * @param productColor
+     * @return
+     */
+    List<ProductColor> listproductAndColor(ProductColor productColor);
 }

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

@@ -0,0 +1,39 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.faces.cm.SalesOrderService;
+import com.iamberry.rst.service.cm.mapper.SalesOrderMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by liuzhiwei on 2017/10/31.
+ */
+@Service
+public class SalesOrderServiceImpl implements SalesOrderService {
+
+    @Autowired
+    private SalesOrderMapper salesOrderMapper;
+
+    @Override
+    public Integer addSalesOrder(SalesOrder salesOrder) {
+        return salesOrderMapper.addSalesOrder(salesOrder);
+    }
+
+    @Override
+    public SalesOrder getSalesOrderById(Integer salesId) {
+        return salesOrderMapper.getSalesOrderById(salesId);
+    }
+
+    @Override
+    public Integer updateSalesOrder(SalesOrder salesOrder) {
+        return salesOrderMapper.updateSalesOrder(salesOrder);
+    }
+
+    @Override
+    public Integer addSalesOrderList(List<SalesOrder> list) {
+        return salesOrderMapper.addSalesOrderList(list);
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.StoreInfo;
+import com.iamberry.rst.faces.cm.StoreInfoService;
+import com.iamberry.rst.service.cm.mapper.StoreInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by liuzhiwei on 2017/11/1.
+ */
+@Service
+public class StoreInfoServiceImpl implements StoreInfoService {
+
+    @Autowired
+    private StoreInfoMapper storeInfoMapper;
+
+    @Override
+    public List<StoreInfo> listStore(StoreInfo storeInfo) {
+        return storeInfoMapper.listStore(storeInfo);
+    }
+}

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

@@ -2,6 +2,8 @@ package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.SalesOrder;
 
+import java.util.List;
+
 public interface SalesOrderMapper {
 
     /**
@@ -24,4 +26,11 @@ public interface SalesOrderMapper {
      * @return
      */
     Integer updateSalesOrder(SalesOrder salesOrder);
+
+    /**
+     * 批量添加订单信息
+     * @param list
+     * @return
+     */
+    Integer addSalesOrderList(List<SalesOrder> list);
 }

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

@@ -2,6 +2,8 @@ package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.StoreInfo;
 
+import java.util.List;
+
 public interface StoreInfoMapper {
 
     /**
@@ -24,4 +26,11 @@ public interface StoreInfoMapper {
      * @return
      */
     Integer updateStoreInfo(StoreInfo storeInfo);
+
+    /**
+     * 根据条件查询店铺信息
+     * @param storeInfo
+     * @return
+     */
+    List<StoreInfo> listStore(StoreInfo storeInfo);
 }

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

@@ -68,11 +68,48 @@
       #{salesAddressInfo,jdbcType=VARCHAR}, #{salesAddressTel,jdbcType=VARCHAR}, #{salesAddressName,jdbcType=VARCHAR}, 
       #{salesAmount,jdbcType=INTEGER}, #{salesPayMoney,jdbcType=INTEGER}, #{salesPayType,jdbcType=INTEGER}, 
       #{salesWaitMoney,jdbcType=INTEGER}, #{salesLastMoney,jdbcType=INTEGER}, #{salesShippingFee,jdbcType=INTEGER}, 
-      #{salesPayTime,jdbcType=TIMESTAMP}, NOW(), #{salesAdminRemark,jdbcType=VARCHAR},
+      #{salesPayTime,jdbcType=TIMESTAMP}, #{salesCreateTime,jdbcType=TIMESTAMP}, #{salesAdminRemark,jdbcType=VARCHAR},
       #{salesUserRemark,jdbcType=VARCHAR}, #{salesPayNumber,jdbcType=VARCHAR}, #{salesStoreId,jdbcType=INTEGER}, 
       #{salesCompanyId,jdbcType=INTEGER}, #{salesType,jdbcType=INTEGER})
   </insert>
 
+  <!--<insert id="addOrderItemList" parameterType="ArrayList">
+    INSERT INTO tb_rst_sales_order_item
+      (
+
+      )
+  </insert>-->
+
+  <!-- 批量添加订单信息 -->
+  <insert id="addSalesOrderList" parameterType="ArrayList" >
+    insert into tb_rst_sales_order_info (
+      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)
+    values
+    <foreach collection="list" item="item" separator=",">
+    (
+      #{item.salesId}, #{item.salesOrderid}, #{item.salesOpenid},
+      #{item.salesDiscountMoney}, #{item.salesPledgeMoney}, #{item.salesRemainDeposit},
+      #{item.salesStatus}, #{item.salesSendType}, #{item.salesSendTime},
+      #{item.salesSalesTime}, #{item.salesPostNum}, #{item.salesPostFirm},
+      #{item.salesAddressInfo}, #{item.salesAddressTel}, #{item.salesAddressName},
+      #{item.salesAmount}, #{item.salesPayMoney}, #{item.salesPayType},
+      #{item.salesWaitMoney}, #{item.salesLastMoney}, #{item.salesShippingFee},
+      #{item.salesPayTime}, #{item.salesCreateTime}, #{item.salesAdminRemark},
+      #{item.salesUserRemark}, #{item.salesPayNumber}, #{item.salesStoreId},
+      #{item.salesCompanyId}, #{item.salesType}
+    )
+    </foreach>
+  </insert>
+
   <!-- 修改订单信息 -->
   <update id="updateSalesOrder" parameterType="SalesOrder" >
     update tb_rst_sales_order_info

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

@@ -22,6 +22,22 @@
     where store_id = #{storeId,jdbcType=INTEGER}
   </select>
 
+  <!-- 根据条件查询店铺信息 -->
+  <select id="listStore" parameterType="StoreInfo" resultType="StoreInfo">
+    select
+      *
+    from
+      tb_rst_store_info
+    <where>
+      <if test="storeEfast != null">
+        store_efast = #{storeEfast}
+      </if>
+      <if test="storeStatus != null">
+        and storeStatus = #{storeStatus}
+      </if>
+    </where>
+  </select>
+
   <!-- 添加店铺信息 -->
   <insert id="addStoreInfo" parameterType="StoreInfo" >
     insert into tb_rst_store_info (store_id, company_id, store_efast, 

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

@@ -39,6 +39,7 @@ public class EfastOrderServiceImpl implements EfastOrderService {
     private static final String EFAST_ORDER_ADD = "efast.trade.new.add";
     private static final String EFAST_ORDER_SELECT = "efast.trade.detail.get";
     private static final String EFAST_ORDER_INVALID = "efast.trade.invalid";
+    private static final String EFAST_ORDER_SELECT_LIST = "efast.trade.list.get";
     private static final String COMPANY_TEL = "075523605578";
     private static Logger logger = LoggerFactory.getLogger(EfastOrderServiceImpl.class);
     private static final String[] PAY_TYPE = {"","weixinpay","cash","","bank","alipay"};
@@ -319,6 +320,38 @@ public class EfastOrderServiceImpl implements EfastOrderService {
     }
 
     @Override
+    public JSONObject getOrderFormEfast(String orderid) throws Exception {
+        if(StringUtils.isEmpty(orderid)) return null;
+
+        Map<String, String> requestData = getRequestData(EFAST_ORDER_SELECT);
+        requestData.put("oid", orderid);
+        requestData.put("feilds","order_status,shipping_status");   //1.order_status 订单状态:0(未确认)1(确认)2(挂起)3(作废)     2.shipping_status发货状态: 0(未发货)1(已发货,即已扫描出库)3(备货中)
+
+        try {
+            String result = HttpClient431Util.doGet(requestData, EFAST_BASE_URL);
+            result = StringEscapeUtils.unescapeJava(result); // unicode 编码
+            Pattern p = Pattern.compile("\\s*|\t|\r|\n");
+            Matcher m = p.matcher(result);
+            if (m.find()) {
+                result = m.replaceAll("");
+            }
+            logger.info("rst-推送百胜订单号-->>" + orderid + "，百胜返回信息-->" + result);
+            // parse JSON String to Object
+            JSONObject jsonObject = JSONObject.fromObject(result);
+            JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+            if (respData != null) {
+                return respData;
+            } else {
+                logger.error("rst-获取百胜出错，订单号-->>" + orderid + "，百胜返回信息-->" + result);
+                throw new Exception(respData.getString("msg"));
+            }
+        } catch (Exception e) {
+            logger.error("rst-获取百胜出错，订单号-->>" + orderid + "，catch");
+            throw e;
+        }
+    }
+
+    @Override
     public boolean invalidOrderFromEfast(String orderId) throws Exception {
         if(StringUtils.isEmpty(orderId)) {
             logger.error("rst-作废百胜订单出错，传入参数订单号为空-->>");
@@ -349,4 +382,45 @@ public class EfastOrderServiceImpl implements EfastOrderService {
             throw e;
         }
     }
+
+    @Override
+    public JSONObject listOrderInfoFormEfast(int pageNo,int pageSize, String date) throws Exception {
+        java.text.SimpleDateFormat sim = new java.text.SimpleDateFormat("yyyy-MM-dd");
+        // 组装数据
+        Map<String, String> requestData = new HashMap<String, String>();
+        requestData.put("app_nick", NameUtils.getConfig("app_nick"));
+        requestData.put("app_key", NameUtils.getConfig("app_key"));
+        requestData.put("app_secret", NameUtils.getConfig("app_secret"));
+        requestData.put("timestamp",DateTimeUtil.format(new Date(),"yyyyMMddHHmmss"));
+        requestData.put("app_act", EFAST_ORDER_SELECT_LIST);
+        requestData.put("start_time", date);
+        requestData.put("page_no", String.valueOf(pageNo));
+        requestData.put("page_size", String.valueOf(pageSize));
+        try {
+            String resultJson = HttpClient431Util.doPost(requestData, NameUtils.getConfig("efast_base_url"));
+            resultJson = StringEscapeUtils.unescapeJava(resultJson); // unicode
+            logger.info("get-百胜订单列表，百胜返回信息:" + resultJson);
+            JSONObject jsonObject = JSONObject.fromObject(resultJson);
+
+            // default HTTP SUCCESS
+            JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+            // 发货状态 : shipping_status
+            logger.info("get-百胜订单列表，百胜返回信息:" + resultJson);
+            return respData;
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            logger.info("get-百胜订单列表，百胜返回信息，发生错误:" + e.getMessage());
+            return null;
+        }
+    }
+
+    @Override
+    public int getPayType(String payName) throws Exception {
+        int payType = 0;
+        switch (payName) {
+            case "weixinpay":payType = 1;break;
+            default:payType = 1;break;
+        }
+        return payType;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/ProductServiceImpl.java

@@ -1,5 +1,6 @@
 package com.iamberry.rst.service.product;
 
+import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.product.Gift;
 import com.iamberry.rst.core.product.OrderGift;
 import com.iamberry.rst.faces.product.ProductService;
@@ -94,4 +95,9 @@ public class ProductServiceImpl implements ProductService {
         }
         return returnGift;
     }
+
+    @Override
+    public List<ProductColor> listproductAndColor(ProductColor productColor) {
+        return productMapper.listproductAndColor(productColor);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/ProductMapper.java

@@ -1,5 +1,6 @@
 package com.iamberry.rst.service.product.mapper;
 
+import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.product.OrderGift;
 
 import java.util.List;
@@ -19,4 +20,11 @@ public interface ProductMapper {
      * @return
      */
     public List<OrderGift> listGift(OrderGift orderGift);
+
+    /**
+     * 查询产品和产品颜色集合
+     * @param productColor
+     * @return
+     */
+    List<ProductColor> listproductAndColor(ProductColor productColor);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/product/mapper/productMapper.xml

@@ -17,4 +17,38 @@
             AND gift_rent_type = #{giftRentType}
         </if>
     </select>
+
+    <!--根据产品颜色查询产品信息 -->
+    <select id="listproductAndColor" parameterType="ProductColor" resultType="ProductColor">
+        select
+            c.color_id colorId,
+            c.color_product_id colorProductId,
+            c.color_name colorName,
+            c.color_discount colorDiscount,
+            c.color_price colorPrice,
+            c.color_bar colorBar,
+            c.color_picture colorPicture,
+            c.color_status colorStatus,
+            c.color_cretae_time colorCretaeTime,
+            c.color_update_time colorUpdateTime,
+            p.product_name productName,
+            p.Product_type productType
+        from
+          tb_rst_product_color c
+        LEFT JOIN tb_rst_product_info p ON c.color_product_id = p.product_id
+        <where>
+            <if test="colorId != null">
+                color_id = #{colorId}
+            </if>
+            <if test="colorProductId != null">
+                and color_product_id = #{colorProductId}
+            </if>
+            <if test="colorBar != null">
+                and color_bar = #{colorBar}
+            </if>
+            <if test="colorStatus != null">
+                and color_status = #{colorStatus}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -1,12 +1,22 @@
 package com.iamberry.rst.controllers.mq;
 
 import com.iamberry.rst.controllers.sys.SysController;
+import com.iamberry.rst.core.cm.SalesOrder;
+import com.iamberry.rst.core.cm.SalesOrderItem;
+import com.iamberry.rst.core.cm.StoreInfo;
+import com.iamberry.rst.core.order.ProductColor;
 import com.iamberry.rst.core.sms.OrderMessage;
 import com.iamberry.rst.core.sms.SmsMessage;
+import com.iamberry.rst.faces.cm.StoreInfoService;
+import com.iamberry.rst.faces.order.EfastOrderService;
+import com.iamberry.rst.faces.product.ProductService;
 import com.iamberry.rst.faces.sms.MessageService;
 import com.iamberry.rst.faces.sms.SmsService;
 import com.iamberry.rst.service.sms.mapper.MessageMapper;
 import com.iamberry.wechat.tools.ResponseJson;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
@@ -15,6 +25,9 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -30,6 +43,14 @@ public class MQTask implements InitializingBean {
 	private MessageService messageService;
 	@Autowired
 	private SmsService smsService;
+	@Autowired
+	private EfastOrderService efastOrderService;
+	@Autowired
+	private ProductService productService;
+	@Autowired
+	private StoreInfoService storeInfoService;
+
+	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
 	public void afterPropertiesSet() throws Exception {
 	}
@@ -60,4 +81,137 @@ public class MQTask implements InitializingBean {
 			}
 		}
 	}
+
+	/**
+	 * 批量同步百胜订单信息
+	 * @throws Exception
+	 */
+	//@Scheduled(cron = "0 0 */1 * * ?")//每小时执行一次
+	@Scheduled(cron = "*/10 * * * * ?")
+	public void syncEfastOrderList() throws Exception {
+		int pageNo = 1;
+		int pageSize = 20;
+		boolean flag = false;	//控制是否还需要获取百胜订单信息
+		String date = "2016-04-01";
+		do {
+			//批量获取百胜订单信息
+			JSONObject obj = efastOrderService.listOrderInfoFormEfast(pageNo, pageSize,date);
+			System.out.println("obj="+obj);
+			if (obj == null) {
+				return;
+			}
+			int pageSize1 = obj.getInt("page_size");	//百胜返回数据条目数
+			if (pageSize <= pageSize1) {
+				flag = true;
+				pageNo++;
+			} else {
+				flag = false;
+			}
+			this.addSalesOrderList(obj);
+		} while (flag);	//百胜返回条目数如果等于设置的分页条目数，则继续查询下一页
+	}
+
+	/**
+	 * 添加订单信息
+	 * @param obj
+	 * @throws Exception
+	 */
+	public void addSalesOrderList(JSONObject obj) throws Exception {
+		if (obj == null) {
+			return;
+		}
+		JSONArray orderList = obj.getJSONArray("list");
+		if (orderList == null || orderList.size() == 0) {
+			return;
+		}
+		for (int i = 0;i < orderList.size();i++) {
+			JSONObject order = orderList.getJSONObject(i);
+			//获取订单详情
+			JSONObject orderInfo = efastOrderService.getOrderFormEfast(order.getString("order_sn"));
+			if (orderInfo == null) {
+				return;
+			}
+			//获取订单项集合
+			JSONArray itemArray = orderInfo.getJSONArray("orders");
+			if (itemArray == null || itemArray.size() == 0) {
+				return;
+			}
+
+			SalesOrder salesOrder = new SalesOrder();
+			salesOrder.setSalesOrderId(order.getString("order_sn"));//订单编号
+			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 (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.setSalesPayType(efastOrderService.getPayType(order.getString("pay_name")));//支付方式
+			salesOrder.setSalesPayTime(format.parse(order.getString("pay_time")));//支付时间
+			salesOrder.setSalesUserRemark(order.getString("postscript"));//买家留言
+			salesOrder.setSalesAdminRemark(order.getString("to_buyer"));//商家留言
+			salesOrder.setSalesAmount(order.getInt("order_amount")*100);//应付款
+			salesOrder.setSalesPayMoney(order.getInt("money_paid")*100);//已付款
+			salesOrder.setSalesAddressName(order.getString("consignee"));//收货人
+			salesOrder.setSalesAddressTel(order.getString("mobile"));//收货人电话
+			salesOrder.setSalesAddressInfo(order.getString("address").replaceAll(" ","-"));//收货地址
+			salesOrder.setSalesShippingFee(order.getInt("shipping_fee")*100);//邮费
+			salesOrder.setSalesCreateTime(format.parse(order.getString("create_time")));//创建时间
+			if (StringUtils.isNotEmpty(order.getString("delivery_time"))) {
+				salesOrder.setSalesSendTime(format.parse(order.getString("delivery_time")));//发货时间
+			}
+			salesOrder.setSalesDiscountMoney(salesOrder.getSalesAmount() - salesOrder.getSalesPayMoney());//优惠金额
+			salesOrder.setSalesPledgeMoney(0);//押金金额
+			salesOrder.setSalesRemainDeposit(0);//待提取金额
+			salesOrder.setSalesSendType(2);//发货方式，默认为物流发货
+			salesOrder.setSalesSalesTime(salesOrder.getSalesCreateTime());//订购时间
+			salesOrder.setSalesWaitMoney(0);//待付金额
+			salesOrder.setSalesLastMoney(salesOrder.getSalesPayMoney());//本次支付金额
+			salesOrder.setSalesPayNumber("0000");//支付尾号
+			salesOrder.setSalesType(1);//订单类型
+			//查询店铺信息
+			StoreInfo storeInfo = new StoreInfo();
+			storeInfo.setStoreEfast(order.getString("sd_id"));
+			List<StoreInfo> storeList = storeInfoService.listStore(storeInfo);
+			int storeId = 0;
+			int companyId = 0;
+			if (storeList == null || storeList.size() == 0) {
+				storeInfo = storeList.get(0);
+				storeId = storeInfo.getStoreId();
+				companyId = storeInfo.getCompanyId();
+			}
+			salesOrder.setSalesStoreId(storeId);//店铺id
+			salesOrder.setSalesCompanyId(companyId);//销售公司id
+			List<SalesOrderItem> itemList = new ArrayList<SalesOrderItem>();
+			for (int j = 0;j < itemArray.size();j++) {
+				ProductColor color = new ProductColor();
+				JSONObject itemJson = itemArray.getJSONObject(j);
+				SalesOrderItem item = new SalesOrderItem();
+				color.setColorBar(itemJson.getString("goods_sn"));
+				List<ProductColor> colorList = productService.listproductAndColor(color);
+				if (colorList == null || colorList.size() == 0) {
+					return;
+				}
+				color = colorList.get(0);
+				item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
+				item.setItemNum(itemJson.getInt("sn"));//商品数量
+				item.setItemCreateTime(salesOrder.getSalesCreateTime());
+				item.setItemColorId(color.getColorId());
+				item.setItemProductColor(color.getColorName());
+				item.setItemProductDiscount(color.getColorDiscount());
+				item.setItemProductId(color.getColorProductId());
+				item.setItemProductName(color.getProductName());
+				item.setItemProductPic(color.getColorPicture());
+				item.setItemProductType(color.getProductType());
+				item.setItemProductPrice(color.getColorPrice());
+				itemList.add(item);
+			}
+
+		}
+	}
 }