Merge branch 'master' of hyq/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -9,6 +9,8 @@ import com.kmall.admin.service.OrderExceptionRecordService;
 import com.kmall.admin.service.OrderProcessRecordService;
 import com.kmall.admin.service.OrderService;
 import com.kmall.api.contants.Dict;
+import com.kmall.common.entity.SysUserEntity;
+import com.kmall.common.utils.ShiroUtils;
 import com.kmall.common.utils.print.ticket.item.Ticket;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
@@ -48,6 +50,10 @@ public class OrderController {
     @RequestMapping("/list")
     @RequiresPermissions("order:list")
     public R list(@RequestParam Map<String, Object> params) {
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        if(user.getRoleType().equalsIgnoreCase("2")){
+            params.put("storeId", user.getStoreId());
+        }
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/java/com/kmall/admin/controller/OrderRefundController.java

@@ -5,9 +5,11 @@ import java.util.Map;
 
 import com.kmall.admin.entity.OrderRefundEntity;
 import com.kmall.admin.service.OrderRefundService;
+import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
+import com.kmall.common.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,6 +35,10 @@ public class OrderRefundController {
     @RequiresPermissions("orderrefund:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        if(user.getRoleType().equalsIgnoreCase("2")){
+            params.put("storeId", user.getStoreId());
+        }
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/java/com/kmall/admin/controller/ProductStoreRelaController.java

@@ -2,9 +2,12 @@ package com.kmall.admin.controller;
 
 import com.kmall.admin.entity.ProductStoreRelaEntity;
 import com.kmall.admin.service.ProductStoreRelaService;
+import com.kmall.api.contants.Dict;
+import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
+import com.kmall.common.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,6 +36,10 @@ public class ProductStoreRelaController {
     @RequestMapping("/list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        if(user.getRoleType().equalsIgnoreCase("2")){
+            params.put("storeId", user.getStoreId());
+        }
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/java/com/kmall/admin/controller/StoreController.java

@@ -2,9 +2,11 @@ package com.kmall.admin.controller;
 
 import com.kmall.admin.entity.StoreEntity;
 import com.kmall.admin.service.StoreService;
+import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
+import com.kmall.common.utils.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -33,6 +35,10 @@ public class StoreController {
     @RequiresPermissions("store:list")
     @ResponseBody
     public R list(@RequestParam Map<String, Object> params) {
+        SysUserEntity user = ShiroUtils.getUserEntity();
+        if(user.getRoleType().equalsIgnoreCase("2")){
+            params.put("id", user.getStoreId());
+        }
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/resources/mybatis/mapper/OrderDao.xml

@@ -84,6 +84,9 @@
         LEFT JOIN mall_user u ON o.user_id = u.id
         LEFT JOIN mall_order_process_record p ON o.order_sn = p.order_sn
         WHERE 1=1
+        <if test="storeId != null">
+            AND o.store_id = #{storeId}
+        </if>
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>
@@ -120,6 +123,9 @@
 
     <select id="queryTotal" resultType="int">
         select count(*) from mall_order o WHERE 1=1
+        <if test="storeId != null">
+            AND o.store_id = #{storeId}
+        </if>
         <if test="orderSn != null and orderSn.trim() != ''">
             AND o.order_sn LIKE concat('%',#{orderSn},'%')
         </if>

kmall-admin/src/main/resources/mybatis/mapper/OrderRefundDao.xml

@@ -79,6 +79,9 @@
         <if test="orderId != null">
             AND o.id = #{orderId}
         </if>
+        <if test="storeId != null">
+            AND o.store_id = #{storeId}
+        </if>
         <if test="shippingStatus != null and shippingStatus.trim() != ''">
             AND o.shipping_status = #{shippingStatus}
         </if>
@@ -122,6 +125,9 @@
         <if test="userName != null and userName.trim() != ''">
             AND u.username LIKE concat('%',#{userName},'%')
         </if>
+        <if test="storeId != null">
+            AND o.store_id = #{storeId}
+        </if>
         <if test="orderId != null">
             AND o.id = #{orderId}
         </if>

kmall-admin/src/main/resources/mybatis/mapper/ProductStoreRelaDao.xml

@@ -126,7 +126,7 @@
         <if test="productId != null">
             AND a.product_id = #{productId}
         </if>
-        <if test="storeId != null and storeId.trim() != ''">
+        <if test="storeId != null">
             AND s.id = #{storeId}
         </if>
         <choose>
@@ -210,7 +210,7 @@
         <if test="productId != null">
             AND a.product_id = #{productId}
         </if>
-        <if test="storeId != null and storeId.trim() != ''">
+        <if test="storeId != null">
             AND s.id = #{storeId}
         </if>
     </select>

kmall-admin/src/main/resources/mybatis/mapper/StoreDao.xml

@@ -87,6 +87,9 @@
 		<if test="storeNumber != null and storeNumber.trim() != ''">
 			AND storeNumber LIKE concat('%',#{store_number},'%')
 		</if>
+		<if test="id != null">
+			AND id = #{id}
+		</if>
         <choose>
             <when test="sidx != null and sidx.trim() != ''">
                 order by ${sidx} ${order}
@@ -109,6 +112,9 @@
 		<if test="storeNumber != null and storeNumber.trim() != ''">
 			AND storeNumber LIKE concat('%',#{store_number},'%')
 		</if>
+		<if test="id != null">
+			AND id = #{id}
+		</if>
 	</select>
 	 
 	<insert id="save" parameterType="com.kmall.admin.entity.StoreEntity" useGeneratedKeys="true" keyProperty="id">