修改小程序引用数据，价格

kmall-api/src/main/java/com/kmall/api/api/ApiCartController.java

@@ -238,7 +238,7 @@ public class ApiCartController extends ApiBaseAction {
         Integer number = jsonParam.getInteger("number");
         String checkCart = jsonParam.getString("checkCart");
         //判断商品是否可以购买
-        GoodsVo goodsInfo = goodsService.queryObject(goodsId);
+        GoodsVo goodsInfo = goodsService.queryObjectByStoreId(goodsId, getStoreId());
         if (null == goodsInfo || goodsInfo.getIs_delete() == 1 || goodsInfo.getIs_on_sale() == 0) {
             return toResponsFail("商品已下架");
         }
@@ -311,7 +311,7 @@ public class ApiCartController extends ApiBaseAction {
         Long goodsId = jsonParam.getLong("goodsId");
         String checkCart = jsonParam.getString("checkCart");
         //判断商品是否可以购买
-        GoodsVo goodsInfo = goodsService.queryObject(goodsId);
+        GoodsVo goodsInfo = goodsService.queryObjectByStoreId(goodsId, getStoreId());
         if (null == goodsInfo || goodsInfo.getIs_delete() == 1 || goodsInfo.getIs_on_sale() == 0) {
             return toResponsFail("商品已下架");
         }
@@ -335,7 +335,7 @@ public class ApiCartController extends ApiBaseAction {
         List<OrderGoodsVo> orderGoodsVos = apiOrderGoodsService.queryList(params);
         for (OrderGoodsVo goodsVo : orderGoodsVos) {
             //判断商品是否可以购买
-            GoodsVo goodsInfo = goodsService.queryObject(goodsVo.getGoods_id());
+            GoodsVo goodsInfo = goodsService.queryObjectByStoreId(goodsVo.getGoods_id(), getStoreId());
             if (null == goodsInfo || goodsInfo.getIs_delete() == 1 || goodsInfo.getIs_on_sale() == 0) {
                 return toResponsFail("商品已下架");
             }

kmall-api/src/main/java/com/kmall/api/api/ApiGoodsController.java

@@ -91,7 +91,7 @@ public class ApiGoodsController extends ApiBaseAction {
     public Object sku(@LoginUser UserVo loginUser, Long goodsId) {
         Map<String, Object> resultObj = new HashMap();
         //
-        GoodsVo goodsVo = goodsService.queryObject(goodsId);
+        GoodsVo goodsVo = goodsService.queryObjectByStoreId(goodsId, getStoreId());
         //
         List<Map> goodsSpecificationEntityList = goodsSpecificationService.queryByGoodsIdGroupByNames(goodsId);
         //
@@ -100,7 +100,7 @@ public class ApiGoodsController extends ApiBaseAction {
         param.put("store_id", getStoreId());
         List<ProductVo> productEntityList = productService.queryList(param);
 
-        CartVo cartVo = cartService.queryObjectByGoodsIdAndUserId(goodsId,getUserId());
+        CartVo cartVo = cartService.queryObjectByGoodsIdAndUserId(goodsId, getUserId(), getStoreId());
         if(cartVo == null){
             resultObj.put("cartNumber", 0);
         }else{
@@ -528,7 +528,7 @@ public class ApiGoodsController extends ApiBaseAction {
         List<Integer> relatedGoods = new ArrayList();
         if (null == relatedGoodsIds || relatedGoods.size() < 1) {
             //查找同分类下的商品
-            GoodsVo goodsCategory = goodsService.queryObject(id);
+            GoodsVo goodsCategory = goodsService.queryObjectByStoreId(id, getStoreId());
             if (null != goodsCategory) {
                 Map paramRelated = new HashMap();
                 paramRelated.put("store_id", getStoreId());

kmall-api/src/main/java/com/kmall/api/api/ApiIndexController.java

@@ -87,7 +87,7 @@ public class ApiIndexController extends ApiBaseAction {
         param.put("fields", "distinct a.id,a.name,a.goods_brief,a.list_pic_url,psr1.retail_price,psr1.market_price,b.id as product_id,psr1.stock_num");
         param.put("is_hot", "1");
         param.put("offset", 0);
-        param.put("limit", 3);
+        param.put("limit", 20);
         param.put("is_delete", 0);
         param.put("store_id", storeId);
         List<GoodsVo> hotGoods = goodsService.queryHotGoodsList(param);

kmall-api/src/main/java/com/kmall/api/dao/ApiCartMapper.java

@@ -26,5 +26,5 @@ public interface ApiCartMapper extends BaseDao<CartVo> {
 
     List<CartVo> queryValidCartList(Map<String, Object> map);
 
-    CartVo queryObjectByGoodsIdAndUserId(@Param("goods_id")Long goods_id,@Param("user_id")Long user_id);
+    CartVo queryObjectByGoodsIdAndUserId(@Param("goods_id")Long goods_id,@Param("user_id")Long user_id,@Param("storeId")Long storeId);
 }

kmall-api/src/main/java/com/kmall/api/service/ApiCartService.java

@@ -34,8 +34,8 @@ public class ApiCartService {
         return cartDao.queryObject(id);
     }
 
-    public CartVo queryObjectByGoodsIdAndUserId(Long goods_id,Long user_id) {
-        return cartDao.queryObjectByGoodsIdAndUserId(goods_id,user_id);
+    public CartVo queryObjectByGoodsIdAndUserId(Long goods_id,Long user_id,Long storeId) {
+        return cartDao.queryObjectByGoodsIdAndUserId(goods_id,user_id,storeId);
     }
 
 
@@ -152,7 +152,7 @@ public class ApiCartService {
             resultObj.put("errmsg", "库存不足,仅剩余" + productVo.getStock_num());
             return resultObj;
         }
-        GoodsVo goodsVo = apiGoodsMapper.queryObject(goods_id);
+        GoodsVo goodsVo = apiGoodsMapper.queryObjectByStoreId(goods_id, store_id);
         CartVo cartInfo = new CartVo();
         cartInfo.setGoods_id(productVo.getGoods_id());
         cartInfo.setProduct_id(productVo.getId());

kmall-api/src/main/java/com/kmall/api/service/ApiGoodsGroupOpenService.java

@@ -82,7 +82,7 @@ public class ApiGoodsGroupOpenService {
         Map resultObj = new HashMap();
         // 开团
         GoodsGroupVo groupVo = apiGoodsGroupMapper.queryObject(groupId);
-        GoodsVo goodsVo = apiGoodsMapper.queryObject(groupVo.getGoods_id());
+        GoodsVo goodsVo = apiGoodsMapper.queryObjectByStoreId(groupVo.getGoods_id(), storeId);
         GoodsGroupOpenVo openVo = new GoodsGroupOpenVo();
         openVo.setUser_id(userId);
         openVo.setGroup_id(groupId);
@@ -204,7 +204,7 @@ public class ApiGoodsGroupOpenService {
         openDetailVo.setAttend_time(new Date());
         apiGoodsGroupOpenDetailMapper.save(openDetailVo);
         //
-        GoodsVo goodsVo = apiGoodsMapper.queryObject(groupVo.getGoods_id());
+        GoodsVo goodsVo = apiGoodsMapper.queryObjectByStoreId(groupVo.getGoods_id(), 0l);
         //统计商品总价
         BigDecimal orderTotalPrice = groupVo.getRetail_min_price().multiply(new BigDecimal(number)); //订单的总价
         AddressVo addressVo = apiAddressMapper.queryObject(addressId);

kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -329,7 +329,7 @@ public class ApiOrderService {
                 for (CartVo goodsItem : checkedGoodsList) {
                     //统计商品总价
                     if (orderInfo.getOrderBizType().equalsIgnoreCase(goodsItem.getGoodsBizType())) {
-                        GoodsVo goodsVo = apiGoodsMapper.queryObject(goodsItem.getGoods_id());
+                        GoodsVo goodsVo = apiGoodsMapper.queryObjectByStoreId(goodsItem.getGoods_id(), storeId);
                         if(goodsVo==null){
                             throw new RRException("订单提交失败：商品不存在");
                         }

kmall-api/src/main/resources/mybatis/mapper/ApiCartMapper.xml

@@ -44,7 +44,7 @@
         <include refid="Base_Column_List" /> from mall_cart where goods_biz_type = #{goodsBizType}
     </select>
     <select id="queryObjectByGoodsIdAndUserId" resultMap="cartMap">
-        SELECT * FROM `mall_cart` where goods_id =#{goods_id} and user_id =#{user_id}
+        SELECT * FROM `mall_cart` where goods_id =#{goods_id} and user_id =#{user_id} and store_id = #{storeId}
     </select>
 
     <select id="queryList" resultMap="cartMap">

kmall-api/src/main/resources/mybatis/mapper/ApiGoodsMapper.xml

@@ -61,9 +61,42 @@
     </sql>
 
     <select id="queryObject" resultMap="goodsMap">
-		select *
-        from mall_goods
-		where id = #{value}
+		select a.id,
+        a.category_id,
+        a.goods_sn,
+        a.name,
+        a.brand_id,
+        a.goods_number,
+        a.keywords,
+        a.goods_brief,
+        a.is_on_sale,
+        a.add_time,
+        a.sort_order,
+        a.is_delete,
+        a.attribute_category,
+        a.counter_price,
+        a.extra_price,
+        a.is_new,
+        a.goods_unit,
+        a.primary_pic_url,
+        a.list_pic_url,
+        psr1.retail_price,
+        a.sell_volume,
+        a.primary_product_id,
+        a.unit_price,
+        a.promotion_desc,
+        a.promotion_tag,
+        a.app_exclusive_price,
+        a.is_app_exclusive,
+        a.is_limited,
+        a.is_hot,
+        a.merch_sn,
+        psr1.store_id,
+        psr1.market_price,
+        psr1.stock_num,
+        a.goods_desc,a.goods_biz_type,a.goods_rate
+        from mall_goods a LEFT JOIN mall_product_store_rela psr1 ON a.id = psr1.goods_id and a.merch_sn = psr1.merch_sn
+		where a.id = #{value}
 	</select>
 
     <select id="queryObjectByStoreId" resultMap="goodsMap">