--no commit message

app/order/src/main/java/com/zrqx/order/bg/mapper/OrderMapper.java

@@ -21,7 +21,7 @@ public interface OrderMapper extends BaseMapper<Order> {
 	 * 查询订单列表
 	 * @param orderFormQuery
 	 * @return
-	 * @author xjg
+	 * @author xjg       
 	 * @date 2019年1月7日 下午5:19:10
 	 */
 	@Select("<script>"
@@ -72,7 +72,7 @@ public interface OrderMapper extends BaseMapper<Order> {
 	 * @date 2019年1月7日 下午5:19:10
 	 */
 	@Select("<script>"
-			+ " select a.id,a.code,a.createrName,a.payment,a.status,a.payTime,a.orderSource,a.payType,a.orderType "
+			+ " select a.id,a.code,a.createrName,a.orderPayment,a.payment,a.status,a.payTime,a.orderSource,a.payType,a.orderType "
 			+ " from ord_order a "
 			+ " where 1 = 1 and a.orderType != 4 "
 			// 订单号

app/order/src/main/java/com/zrqx/order/bg/service/OrderServiceImpl.java

@@ -282,6 +282,11 @@ public class OrderServiceImpl extends BaseServiceImpl<Order, Integer> implements
 	@Override
 	public List<ExcelOrderVO> importOrder(OrderForm form) {
 		List<ExcelOrderVO> list = orderMapper.importOrder(form);
+		if(list.size()>0) {
+			for (ExcelOrderVO excelOrderVO : list) {
+				excelOrderVO.setStatus(OrderStatusEnum.getName(excelOrderVO.getStatus()));
+			}
+		}
 		return list;
 	}
 }