收银端增加同条码多SKU选择bug修复

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

@@ -60,7 +60,7 @@ public interface GoodsDao extends BaseDao<GoodsEntity> {
      * @param storeId
      * @return
      */
-    List<GoodsEntity> queryListByBarcode(@Param("prodBarcode")String prodBarcode, @Param("storeId")Integer storeId);
+    List<GoodsEntity> queryListByBarcode(@Param("prodBarcode")String prodBarcode, @Param("storeId")Integer storeId, @Param("sku")String sku);
 
     List<GoodsEntity> queryByName(@Param("storeId")String storeId, @Param("goodsName")String goodsName);
 

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

@@ -1906,9 +1906,9 @@ public class OrderServiceImpl implements OrderService {
                 Integer goodsSellNumber = (Integer) goodsDto.get("sellVolume");
 
                 String prodBarcode = (String) goodsDto.get("prodBarcode");
-
+                String sku = (String) goodsDto.get("goodsSn");
                 Map<GoodsEntity, Integer> numberMap = new HashMap<>();
-                List<GoodsEntity> queryGoodsList = goodsDao.queryListByBarcode(prodBarcode, storeId);
+                List<GoodsEntity> queryGoodsList = goodsDao.queryListByBarcode(prodBarcode, storeId,sku);
                 if (queryGoodsList != null && queryGoodsList.size() != 0) {
                     for (GoodsEntity goodsEntity : queryGoodsList) {
                         // 如果当前还有需要购买的

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

@@ -819,7 +819,7 @@
             mall_goods a
         LEFT JOIN mall_product_store_rela r ON r.goods_id = a.id
         inner join mall_store s on r.store_id=s.id
-        where a.prod_barcode = #{prodBarcode}  and r.store_id = #{storeId}
+        where a.prod_barcode = #{prodBarcode}  and r.store_id = #{storeId} and a.sku = #{sku}
         and r.stock_num > 0 order by r.stock_num desc
     </select>