上朵分销系统

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/channel/BalanceLog.java

@@ -11,6 +11,7 @@ import  java.io.Serializable;
  * @Date 2018-07-24
  */
 public class BalanceLog  implements  Serializable{
+    private static final long serialVersionUID = 6537337859070836846L;
     //日志id
     private Integer balanceLogId;
     //渠道id

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/channel/ChannelAdmin.java

@@ -8,6 +8,7 @@ import  java.io.Serializable;
  * @Date 2018-08-03
  */
 public class ChannelAdmin  implements  Serializable{
+    private static final long serialVersionUID = -3778309303797043794L;
     //管理员id
     private Integer channelAdminId;
     //渠道id

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/channel/ChannelPrice.java

@@ -10,6 +10,7 @@ import  java.io.Serializable;
  * @Date 2018-07-24
  */
 public class ChannelPrice  implements  Serializable{
+    private static final long serialVersionUID = -7811073771382403898L;
     //返利价格id
     private Integer channelPriceId;
     //返利渠道类型 1:主渠道 2:子渠道

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/channel/ChannelRebate.java

@@ -12,6 +12,8 @@ import  java.io.Serializable;
  * @Date 2018-07-24
  */
 public class ChannelRebate  implements  Serializable{
+    private static final long serialVersionUID = 342783384636300168L;
+
     //返利id
     private Integer rebateId;
     //订单号
@@ -56,6 +58,10 @@ public class ChannelRebate  implements  Serializable{
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date endDate;//结束时间
 
+    private Integer salesTransportationType;	//订单运输类型  1:邮寄  2:自提
+    private String salesAddressTel;				//收件人电话
+    private String salesAddressName;				//收件人姓名
+
     private String[] rebates;//返利id集合
 
     public Integer getRebateId(){
@@ -217,4 +223,28 @@ public class ChannelRebate  implements  Serializable{
     public void setRebates(String[] rebates) {
         this.rebates = rebates;
     }
+
+    public String getSalesAddressTel() {
+        return salesAddressTel;
+    }
+
+    public void setSalesAddressTel(String salesAddressTel) {
+        this.salesAddressTel = salesAddressTel;
+    }
+
+    public String getSalesAddressName() {
+        return salesAddressName;
+    }
+
+    public void setSalesAddressName(String salesAddressName) {
+        this.salesAddressName = salesAddressName;
+    }
+
+    public Integer getSalesTransportationType() {
+        return salesTransportationType;
+    }
+
+    public void setSalesTransportationType(Integer salesTransportationType) {
+        this.salesTransportationType = salesTransportationType;
+    }
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/channel/ChildChannel.java

@@ -11,6 +11,7 @@ import  java.io.Serializable;
  * @Date 2018-07-23
  */
 public class ChildChannel  implements  Serializable{
+    private static final long serialVersionUID = -3420411045049386434L;
     //渠道id
     private Integer childChannelId;
     //openid

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/channel/MainChannel.java

@@ -11,6 +11,7 @@ import  java.io.Serializable;
  * @Date 2018-07-23
  */
 public class MainChannel  implements  Serializable{
+    private static final long serialVersionUID = -623378035777842470L;
     //渠道id
     private Integer mainChannelId;
     //openid

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/order/Order.java

@@ -94,6 +94,8 @@ public class Order implements java.io.Serializable{
 	private String salesChannelAddress;	//渠道自提地点
 	private List<Integer> channelIds;	//渠道ids
 
+	private String salesChannelName;	//渠道名称
+
 	public String getSalesAuditRemark() {
 		return salesAuditRemark;
 	}
@@ -460,4 +462,12 @@ public class Order implements java.io.Serializable{
 	public void setSalesChannelAddress(String salesChannelAddress) {
 		this.salesChannelAddress = salesChannelAddress;
 	}
+
+	public String getSalesChannelName() {
+		return salesChannelName;
+	}
+
+	public void setSalesChannelName(String salesChannelName) {
+		this.salesChannelName = salesChannelName;
+	}
 }

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

@@ -58,6 +58,10 @@ public class Product implements java.io.Serializable{
 
 	private Integer configAmount;  //代理商的采购价
 
+	private Integer productIsChannel;  //是否为分销  1：是  2：不是
+
+	private String productShowPrice;	//页面展示价格
+
 
 	public Integer getColorId() {
 		return colorId;
@@ -275,6 +279,22 @@ public class Product implements java.io.Serializable{
 		this.configAmount = configAmount;
 	}
 
+	public Integer getProductIsChannel() {
+		return productIsChannel;
+	}
+
+	public void setProductIsChannel(Integer productIsChannel) {
+		this.productIsChannel = productIsChannel;
+	}
+
+	public String getProductShowPrice() {
+		return productShowPrice;
+	}
+
+	public void setProductShowPrice(String productShowPrice) {
+		this.productShowPrice = productShowPrice;
+	}
+
 	@Override
 	public String toString() {
 		return "Product [productId=" + productId + ", productName="

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/ProductInfoService.java

@@ -3,6 +3,8 @@ package com.iamberry.wechat.face.cart;
 import java.util.List;
 
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
 import com.iamberry.wechat.core.entity.product.*;
 
 public interface ProductInfoService {
@@ -136,4 +138,7 @@ public interface ProductInfoService {
 	 * @return
 	 */
 	ProductImageText selectProductImagetext(Integer productId);
+
+	//分页查询商品信息
+	PagedResult<Product> getProductPage(PageRequest<Product> pageRequest);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/ProductInfoServiceImpl.java

@@ -1,17 +1,19 @@
 package com.iamberry.wechat.service.cart;
 
-import java.util.List;
-
-import com.iamberry.wechat.core.entity.PageBean;
-import com.iamberry.wechat.core.entity.product.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import com.github.pagehelper.PageHelper;
 import com.iamberry.wechat.core.entity.cart.ShopOrderItemDto;
 import com.iamberry.wechat.core.entity.cart.UserGiftDto;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
+import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.face.cart.ProductInfoService;
 import com.iamberry.wechat.service.cart.dao.CartDao;
 import com.iamberry.wechat.service.cart.dao.ProductInfoDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import util.PageUtil;
+
+import java.util.List;
 
 @Service
 public class ProductInfoServiceImpl implements ProductInfoService {
@@ -136,6 +138,13 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 	}
 
 	@Override
+	public PagedResult<Product> getProductPage(PageRequest<Product> pageRequest) {
+		PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+		List<Product> detedctList = productInfoDao.getProductPage(pageRequest.getData());
+		return PageUtil.getPage(detedctList);
+	}
+
+	@Override
 	public Product selectProductByColorId(Integer colorId) {
 		return productInfoDao.selectProductByColorId(colorId);
 	}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/ProductInfoDao.java

@@ -131,4 +131,7 @@ public interface ProductInfoDao {
 	 * @return
 	 */
 	ProductImageText selectProductImagetext(Integer productId);
+
+	//分页查询商品信息
+	List<Product> getProductPage(Product product);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/ProductInfoDaoImpl.java

@@ -127,6 +127,11 @@ public class ProductInfoDaoImpl implements ProductInfoDao {
 	}
 
 	@Override
+	public List<Product> getProductPage(Product product) {
+		return productInfoMapper.getProductPage(product);
+	}
+
+	@Override
 	public Product selectProductByColorId(Integer colorId) {
 		return productInfoMapper.selectProductByColorId(colorId);
 	}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/ProductInfoMapper.java

@@ -132,4 +132,7 @@ public interface ProductInfoMapper {
 	 * @return
 	 */
 	ProductImageText selectProductImagetext(Integer productId);
+
+	//分页查询商品信息
+	List<Product> getProductPage(Product product);
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -57,28 +57,38 @@
 		PP.PLACE_ROLE_ID vipRole,
 		PP.PLACE_OPENID placeOpenID,
 		U.USER_RES_TYPE userResource,
+		o.sales_is_customized salesIsCustomized,
+		o.sales_transportation_type salesTransportationType,
+		o.sales_channel_id salesChannelId,
+		o.sales_channel_type salesChannelType,
+		o.sales_channel_address salesChannelAddress,
+		chan.sales_channel_name salesChannelName,
 		(SELECT IFNULL(SUM(reback_money),0) FROM tb_iamberry_reback WHERE reback_orderid = O.SALES_ORDERID and Reback_status  = 2) placeId
 		FROM
 		TB_IAMBERRY_SHOP_SALES_ORDER O
 		LEFT JOIN
-		TB_IAMBERRY_USER_USERINFO U
-		ON
-		O.SALES_OPENID = U.USER_OPENID
+		TB_IAMBERRY_USER_USERINFO U ON O.SALES_OPENID = U.USER_OPENID
 		<!-- 根据用户信息中的dealers查询对应的关系 -->
-		LEFT JOIN
-		TB_IAMBERRY_DEALERS D
-		ON
-		U.USER_DEALERS = D.DEALER_ID
+		LEFT JOIN TB_IAMBERRY_DEALERS D ON U.USER_DEALERS = D.DEALER_ID
 		<!-- 查询用户关系对应的商户 -->
-		LEFT JOIN
-		TB_IAMBERRY_PLACE_INFO P
-		ON
-		D.DEALER_ID = P.PLACE_PIDS
+		LEFT JOIN TB_IAMBERRY_PLACE_INFO P ON D.DEALER_ID = P.PLACE_PIDS
 		<!-- 查询商户的上级，也就是门店 -->
-		LEFT JOIN
-		TB_IAMBERRY_PLACE_INFO PP
-		ON
-		P.PLACE_PID = PP.PLACE_ID
+		LEFT JOIN TB_IAMBERRY_PLACE_INFO PP ON P.PLACE_PID = PP.PLACE_ID
+		LEFT JOIN (
+			SELECT
+			mc.main_channel_id AS sales_channel_id,
+			mc.main_channel_name AS sales_channel_name,
+			1 AS sales_channel_type
+			FROM
+			tb_iamberry_main_channel mc
+			UNION ALL
+			SELECT
+			cc.child_channel_id AS sales_channel_id,
+			cc.child_channel_name AS sales_channel_name,
+			2 AS sales_channel_type
+			FROM
+			tb_iamberry_child_channel cc
+		) chan ON O.sales_channel_type = chan.sales_channel_type AND O.sales_channel_id = chan.sales_channel_id
 		WHERE
 		O.SALES_ORDER_TYPE = 1
 		<if test="salesStatus != null and salesStatus != -1">
@@ -929,6 +939,7 @@
 		<result    column="sales_is_customized"    property="salesIsCustomized" />
 		<collection property="orderItemList" column="sales_orderid" javaType="ArrayList" select="getOrderItemListToExcel"/>
 	</resultMap>
+
 	<select id="getOrderListToExcel" resultMap="BaseResultMap" parameterType="Order" >
 		select
 			t.sales_orderid,
@@ -966,11 +977,32 @@
 			t.sales_is_rfund,
 			t.sales_audit_remark,
 			t.sales_is_customized,
+			t.sales_transportation_type,
+			t.sales_channel_type,
+			t.sales_channel_id,
+			t.sales_channel_address,
+			chan.sales_channel_name,
 			uuer.user_nickname
 		from tb_iamberry_shop_sales_order t
 		LEFT JOIN tb_iamberry_user_userinfo uuer ON t.sales_openid = uuer.user_openid
+		LEFT JOIN (
+			SELECT
+				mc.main_channel_id AS sales_channel_id,
+				mc.main_channel_name AS sales_channel_name,
+				1 AS sales_channel_type
+			FROM
+				tb_iamberry_main_channel mc
+			UNION ALL
+				SELECT
+					cc.child_channel_id AS sales_channel_id,
+					cc.child_channel_name AS sales_channel_name,
+					2 AS sales_channel_type
+				FROM
+					tb_iamberry_child_channel cc
+		) chan ON t.sales_channel_type = chan.sales_channel_type AND t.sales_channel_id = chan.sales_channel_id
 		WHERE t.sales_status in (2,5,9,10,11,12)
 	</select>
+
 	<select id="getOrderItemListToExcel" resultType="OrderItem" parameterType="String" >
 		select
 		    t.item_id,

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/channelRebateMapper.xml

@@ -30,6 +30,9 @@
            so.sales_amount,
            so.sales_yet_amount,
            so.sales_transaction_date,
+           so.sales_transportation_type,
+           so.sales_address_name,
+           so.sales_address_tel,
            pc.color_name,
            oi.item_num
        from tb_iamberry_channel_rebate t
@@ -37,6 +40,7 @@
        LEFT JOIN tb_iamberry_shop_order_item oi on oi.item_id = t.rebate_item_id
        LEFT JOIN tb_iamberry_product_color pc on pc.color_id = oi.item_color_id
         <where>
+            so.sales_status IN (2,3,4,5,6,7,8,9,10,11,12)
             <if test="rebateId != null   and rebateId != '' ">
                 AND t.rebate_id = #{rebateId}
             </if >

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/productInfoMapper.xml

@@ -67,7 +67,16 @@
 		COLOR_PRESENT colorPresent
 		FROM tb_iamberry_product_info PI
 		LEFT JOIN tb_iamberry_product_color PC ON PC.color_product_id=PI.PRODUCT_ID
-		WHERE PI.PRODUCT_TYPE=#{productType} AND PC.COLOR_STATUS=1 AND  PC.color_is_channel = 2
+
+		<where>
+			PC.COLOR_STATUS=1 AND  PC.color_is_channel = 2
+			<if test="productType != null ">
+				AND PI.PRODUCT_TYPE=#{productType}
+			</if>
+			<if test="colorProductId != null ">
+				AND COLOR_PRODUCT_ID = #{colorProductId}
+			</if>
+		</where>
 		ORDER BY PI.product_sort_num,PC.color_id
 		<if test="page!=null and page.recordBegin>0 and page.pageSize>0 ">
 			limit ${page.recordBegin},${page.pageSize}
@@ -423,4 +432,17 @@
 		</where>
 	</select>
 
+
+	<!-- 分页查询商品信息 -->
+	<select id="getProductPage" parameterType="Product" resultType="Product">
+		SELECT
+			<include refid="product"></include>
+		FROM
+			TB_IAMBERRY_PRODUCT_INFO
+		WHERE
+			PRODUCT_STATUS = 1
+		AND  product_is_channel = 2
+		AND  product_type = #{productType.typeId}
+	</select>
+
 </mapper>

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -1094,6 +1094,8 @@ public class AdminOrderHandlers {
         titles.add("收货人");
         titles.add("昵称");
         titles.add("手机号码");
+        titles.add("渠道层级");
+        titles.add("渠道名称");
         model.put("titles", titles);
         List<List<Object>> countexts = new ArrayList<List<Object>>();
         for (Order info : orderList) {
@@ -1168,6 +1170,19 @@ public class AdminOrderHandlers {
                 row.add(info.getSalesAddressName() == null ? "":info.getSalesAddressName());
                 row.add(info.getUserNickname() == null ? "":info.getUserNickname());
                 row.add(info.getSalesAddressTel() == null ? "":info.getSalesAddressTel());
+
+                if(info.getSalesChannelType() != null) {    //1:主渠道  2:子渠道
+                    if (info.getSalesChannelType() == 1) {
+                        row.add("主渠道");
+                    }else  if (info.getSalesChannelType() == 2){
+                        row.add("子渠道");
+                    }else{
+                        row.add("");
+                    }
+                }else{
+                    row.add("");
+                }
+                row.add(info.getSalesChannelName() == null ? "":info.getSalesChannelName());
                 countexts.add(row);
             }
         }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/ProductInfoHandler.java

@@ -7,6 +7,9 @@ import com.iamberry.wechat.core.entity.cart.UserGiftDto;
 import com.iamberry.wechat.core.entity.channel.ChannelPrice;
 import com.iamberry.wechat.core.entity.drp.PlaceInfo;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.Order;
+import com.iamberry.wechat.core.entity.page.PageRequest;
+import com.iamberry.wechat.core.entity.page.PagedResult;
 import com.iamberry.wechat.core.entity.product.*;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.cart.CartService;
@@ -25,6 +28,7 @@ import com.iamberry.wechat.tools.QrCodeUtil;
 import com.iamberry.wechat.tools.ResultInfo;
 import com.iamberry.wechat.tools.StaticInfo;
 import com.iamberry.wechat.utils.Result;
+import com.iamberry.wechat.utils.StitchAttrUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -631,7 +635,9 @@ public class ProductInfoHandler {
 	@RequestMapping("/listProductColorByTypeId")
 	public  ResultMsg listProductColorByTypeId( @RequestParam(value= "typeId") Integer typeId,
 											   @RequestParam(value= "pageSize",defaultValue= "6" ,required=false) Integer pageSize,
-											   @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO){
+											   @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+												@RequestParam(value = "totalNum", defaultValue = "0", required = false) Integer totalNum
+	){
 		ResultMsg rm=new ResultMsg();
 		if(typeId!=null&&typeId<0){
 			rm.setStatus(false);
@@ -640,19 +646,46 @@ public class ProductInfoHandler {
 			return rm;
 		}
 
-		ProductColor productColor=new ProductColor();
-		productColor.setProductType(typeId);
-		productColor.getPage().setPageSize(pageSize);
-		productColor.getPage().setPageNumber(pageNO);
-		productColor.getPage().initRecordBegin();
-		List<ProductColor> list=productInfoService.listProductColorByTypeId(productColor);
-		if(list!=null&&list.size()<0){
-			rm.setStatus(false);
-			rm.setResultCode(ResultInfo.ERRORCODE);
-			return rm;
+		ProductType productType = new ProductType();
+		productType.setTypeId(typeId);
+
+		Product product = new Product();
+		product.setProductType(productType);
+		// 封装请求数据
+		PageRequest<Product> pageRequest = new PageRequest<>(product, pageNO, pageSize, totalNum == 0);
+		// 查询订单列表
+		PagedResult<Product> result = productInfoService.getProductPage(pageRequest);
+
+		for (Product pro:result.getDataList()) {
+			ProductColor productColor = new ProductColor();
+			productColor.setColorProductId(pro.getProductId());
+			List<ProductColor> productColorList = productInfoService.listProductColorByTypeId(productColor);
+
+			if(productColorList != null && productColorList.size() > 0){
+				pro.setColorId(productColorList.get(0).getColorId());
+			}
+
+			Integer max=0,min=0;
+			for (ProductColor pc:productColorList) {
+				if(pc.getColorDiscount() > max){
+					max = pc.getColorDiscount();
+				}
+				if(min == 0 || pc.getColorDiscount() < min){
+					min = pc.getColorDiscount();
+				}
+			}
+			if(max == min){
+				pro.setProductShowPrice(String.valueOf(max/100));
+			}else{
+				pro.setProductShowPrice(min/100 + "-" +max/100);
+			}
 		}
+
+		Boolean lastPage = StitchAttrUtil.getSa().getLastPage(result);
+
 		Map<String,Object> map=new HashMap<String, Object>();
-		map.put("productColorList",list);
+		map.put("list", result.getDataList());
+		map.put("lastPage",lastPage);
 		map.put("typeId",typeId);
 		rm.setStatus(true);
 		rm.setResultCode(ResultInfo.SUCCESSCODE);

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/adminChannel/channelRebate_list.jsp

@@ -61,20 +61,23 @@
         <table class="table table-border table-bordered table-bg">
             <thead>
             <tr>
-                <th scope="col" colspan="12">积分记录列表</th>
+                <th scope="col" colspan="15">积分记录列表</th>
             </tr>
             <tr class="text-c">
                 <th width="50"></th>
-                <th width="150">订单编号</th>
+                <th width="130">订单编号</th>
                 <th width="150">订单金额</th>
                 <th width="90">支付金额</th>
                 <th width="130">交易日期</th>
                 <th width="100">产品颜色</th>
                 <th width="100">产品数量</th>
+                <th width="100">是否自提</th>
+                <th width="100">购买人姓名</th>
+                <th width="100">购买人电话</th>
                 <th width="100">返利金额</th>
                 <th width="100">返利状态</th>
                 <th width="100">返利日期</th>
-                <th width="100">创建日期</th>
+                <th width="120">创建日期</th>
                 <th width="100">操作</th>
             </tr>
             </thead>
@@ -93,6 +96,14 @@
                 <td><fmt:formatDate value="${infolist.salesTransactionDate}" pattern="yyyy-MM-dd"/></td>
                 <td>${infolist.colorName}</td>
                 <td>${infolist.itemNum}</td>
+
+                <td>
+                    <c:if test="${infolist.salesTransportationType == 1 }">邮寄</c:if>
+                    <c:if test="${infolist.salesTransportationType == 2 }">自提</c:if>
+                </td>
+                <td>${infolist.salesAddressName}</td>
+                <td>${infolist.salesAddressTel}</td>
+
                 <td>${infolist.rebackAmount/100}元</td>
                 <td>${infolist.rebackStatus==1?'待返利':''}${infolist.rebackStatus==2?'已返利，待打款':''}${infolist.rebackStatus==3?'已返利，已打款':''}${infolist.rebackStatus==4?'已取消':''}</td>
                 <td><fmt:formatDate value="${infolist.rebackTime}" pattern="yyyy-MM-dd"/></td>
@@ -105,7 +116,7 @@
                 </c:forEach>
                 </c:if>
                 <c:if test="${empty page.dataList}">
-                    <tr align="center"><td colspan="12" style="text-align: center;">未查询到该类数据!</td></tr>
+                    <tr align="center"><td colspan="15" style="text-align: center;">未查询到该类数据!</td></tr>
                 </c:if>
             </tbody>
         </table>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/orderList.jsp

@@ -228,8 +228,8 @@
 						<th width="150">用户备注</th>
 						<th width="150">物流单号</th>
 						<%--<th width="100">所属门店</th>
-						<th width="100">所属VIP会员</th>
-						<th width="100">用户来源</th>--%>
+						<th width="100">所属VIP会员</th>--%>
+						<th width="150">渠道</th>
 						<th width="150">操作</th>
 					</tr>
 				</thead>
@@ -317,6 +317,12 @@
 								<%--<td width="100">${order.storesName }</td>
 								<td width="100">${order.vipName }</td>
 								<td class="text-c" width="100">${order.userResource }</td>--%>
+
+								<td width="100">
+									<c:if test="${ empty order.salesChannelType or order.salesChannelType == 0 }">微信商城</c:if>
+									<c:if test="${ order.salesChannelType == 1 or order.salesChannelType == 2 }">${order.salesChannelName }</c:if>
+								</td>
+
 								<!-- 遍历操作 -->
 							<td class="td-manage text-c">
 								<div class="dropDown dropDown_hover">