Merge branch 'master' of xwh/kmall-pt-general into master

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

@@ -1,9 +1,6 @@
 package com.kmall.admin.controller;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
+import com.kmall.admin.entity.GoodsBatchEntity;
 import com.kmall.admin.service.GoodsBatchService;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
@@ -12,7 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import com.kmall.admin.entity.GoodsBatchEntity;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 批次（多）— SKU（多）Controller
@@ -104,4 +102,17 @@ public class GoodsBatchController {
 
         return R.ok().put("list", list);
     }
+
+
+    /**
+     * 根据sku查批次列表
+     * @param sku
+     * @return
+     */
+    @RequestMapping("/queryListBySku")
+    @ResponseBody
+    public R queryListBySku(@RequestParam String sku) {
+        List<GoodsBatchEntity> list = goodsBatchService.queryListBySku(sku);
+        return R.ok().put("goodsBatchList",list);
+    }
 }

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

@@ -54,7 +54,7 @@ public class StoreController {
     public R list(@RequestParam Map<String, Object> params) {
 
         ParamUtils.setQueryPowerByRoleType(params, "id", "merchSn", "thirdPartyMerchCode");
-        ParamUtils.setName(params, "storeName");
+//        ParamUtils.setName(params, "storeName");
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/java/com/kmall/admin/dao/GoodsBatchDao.java

@@ -2,6 +2,9 @@ package com.kmall.admin.dao;
 
 import com.kmall.admin.entity.GoodsBatchEntity;
 import com.kmall.manager.dao.BaseDao;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 批次（多）— SKU（多）Dao
@@ -12,4 +15,5 @@ import com.kmall.manager.dao.BaseDao;
  */
 public interface GoodsBatchDao extends BaseDao<GoodsBatchEntity> {
 
+    List<GoodsBatchEntity> queryListBySku(@Param("sku") String sku);
 }

kmall-admin/src/main/java/com/kmall/admin/service/GoodsBatchService.java

@@ -69,4 +69,6 @@ public interface GoodsBatchService {
      * @return 删除条数
      */
     int deleteBatch(Integer[] ids);
+
+    List<GoodsBatchEntity> queryListBySku(String sku);
 }

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsBatchServiceImpl.java

@@ -56,4 +56,9 @@ public class GoodsBatchServiceImpl implements GoodsBatchService {
     public int deleteBatch(Integer[]ids) {
         return goodsBatchDao.deleteBatch(ids);
     }
+
+    @Override
+    public List<GoodsBatchEntity> queryListBySku(String sku) {
+        return goodsBatchDao.queryListBySku(sku);
+    }
 }

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

@@ -72,8 +72,11 @@
 			AND sku LIKE concat('%',#{sku},'%')
 		</if>
 	</select>
-	 
-	<insert id="save" parameterType="com.kmall.admin.entity.GoodsBatchEntity">
+    <select id="queryListBySku" resultType="com.kmall.admin.entity.GoodsBatchEntity">
+		select * from mall_goods_batch where sku=#{sku}
+	</select>
+
+    <insert id="save" parameterType="com.kmall.admin.entity.GoodsBatchEntity">
 		insert into mall_goods_batch(
 			`id`,
 			`batch_sn`,

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

@@ -75,10 +75,10 @@
 	<select id="searchListByStatusAndSku" resultType="com.kmall.admin.entity.GoodsTransportInfoDetailEntity">
 		select * from mall_goods_transport_info_detail where 1=1
 		<if test="wayStatus!=null">
-			AND way_status=#{wayStatus}
+			AND way_status LIKE CONCAT('%',#{wayStatus},'%')
 		</if>
 		<if test="sku!=null and sku.trim() != ''">
-			AND sku=#{sku}
+			AND sku LIKE CONCAT('%',#{sku},'%')
 		</if>
 		<choose>
 			<when test="query.sidx != null and query.sidx.trim() != ''">
@@ -96,10 +96,10 @@
 		select count(*) from mall_goods_transport_info_detail
 		WHERE 1=1
 		<if test="wayStatus!=null">
-			AND way_status=#{wayStatus}
+			AND way_status LIKE CONCAT('%',#{wayStatus},'%')
 		</if>
 		<if test="sku!=null and sku.trim() != ''">
-			AND sku=#{sku}
+			AND sku LIKE CONCAT('%',#{sku},'%')
 		</if>
 	</select>
 

kmall-admin/src/main/resources/mybatis/mapper/mk/store/MkStoreTopicStatDao.xml

@@ -107,8 +107,8 @@
 		LEFT JOIN mk_store_prom_type pt ON p.prom_type_id = pt.prom_type_id
 		LEFT JOIN third_merchant_biz tb ON s.third_party_merch_code = tb.third_party_merch_code
 		WHERE 1=1
-		<if test="name != null and name.trim() != ''">
-			AND name LIKE concat('%',#{name},'%')
+		<if test="storeName != null and storeName.trim() != ''">
+			AND s.store_name LIKE concat('%',#{storeName},'%')
 		</if>
 		<if test="storeId != null and storeId != ''">
 			AND t.store_id = #{storeId}
@@ -139,9 +139,9 @@
 		LEFT JOIN mk_store_prom_type pt ON p.prom_type_id = pt.prom_type_id
 		LEFT JOIN third_merchant_biz tb ON s.third_party_merch_code = tb.third_party_merch_code
 		WHERE 1=1
-        <if test="name != null and name.trim() != ''">
-            AND name LIKE concat('%',#{name},'%')
-        </if>
+		<if test="storeName != null and storeName.trim() != ''">
+			AND s.store_name LIKE concat('%',#{storeName},'%')
+		</if>
 		<if test="storeId != null and storeId != ''">
 			AND t.store_id = #{storeId}
 		</if>

kmall-admin/src/main/webapp/WEB-INF/page/statis/mkstoretopicstat.html

@@ -10,7 +10,7 @@
         <Row :gutter="16">
             <div class="search-group">
                 <i-col span="4">
-                    <i-input v-model="q.name" @on-enter="query" placeholder="名称"/>
+                    <i-input v-model="q.storeName" @on-enter="query" placeholder="门店名称"/>
                 </i-col>
                 <i-button @click="query">查询</i-button>
                 <i-button @click="reloadSearch">重置</i-button>

kmall-admin/src/main/webapp/js/shop/storeProductStock.js

@@ -590,6 +590,11 @@ var vm = new Vue({
                 vm.storesList = r.list;
             });
         },
+        getGoodsBatchList: function(sku){
+            $.get("../goodsbatch/goodsBatchList?sku="+sku,function (r) {
+
+            });
+        },
         addAttrRow: function () {
             let goodsId = '';
             if (vm.goods) {

kmall-admin/src/main/webapp/js/statis/mkstoretopicstat.js

@@ -266,7 +266,7 @@ let vm = new Vue({
 			]
 		},
 		q: {
-		    name: ''
+            storeName: ''
 		},
         o:{
             orderStatus:''
@@ -394,7 +394,7 @@ let vm = new Vue({
 		},
         reloadSearch: function() {
             vm.q = {
-                name: ''
+                storeName: ''
             }
             vm.reload();
 		},
@@ -405,7 +405,7 @@ let vm = new Vue({
             vm.showViewList = false;
             let page = $("#jqGrid").jqGrid('getGridParam', 'page');
 			$("#jqGrid").jqGrid('setGridParam', {
-                postData: {'name': vm.q.name},
+                postData: {'storeName': vm.q.storeName},
                 page: page
             }).trigger("reloadGrid");
             vm.handleReset('formValidate');