Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-09 853572a113fd9b818b230212986c7ef5be605d52

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java

@@ -629,12 +629,15 @@
      if(data.size() != goodsList.size()){
         String goodsName = "";
         for (Integer goodsId : goodsIds) {
            if(!collect.contains(goodsId)){
               goodsName = goodsClient.getGoodsById(goodsId).getData().getName();
            Goods goods = goodsClient.getGoodsById(goodsId).getData();
            if(1 == goods.getAppointStore() && !collect.contains(goodsId)){
               goodsName = goods.getName();
               break;
            }
         }
         return R.fail(goodsName + "不能在该门店核销");
         if(StringUtils.isNotEmpty(goodsName)){
            return R.fail(goodsName + "不能在该门店核销");
         }
      }
      //开始构建支付信息
      //现金支付的订单金额
@@ -853,12 +856,15 @@
            orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill));
         }
         for (int i = 0; i < objects.size(); i++) {
            Integer id = objects.getJSONObject(i).getInteger("id");
            Integer num1 = objects.getJSONObject(i).getInteger("num");
            orderGood.setNum(num1);
            Goods goods1 = goodsClient.getGoodsById(id).getData();
            orderGood.setGoodJson(JSON.toJSONString(goods1));
            break;
            Long id = objects.getJSONObject(i).getLong("id");
            if(myShoppingCartVo.getId().equals(id.toString())){
               ShoppingCart shoppingCart = this.getById(id);
               Integer num1 = objects.getJSONObject(i).getInteger("num");
               orderGood.setNum(num1);
               Goods goods1 = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
               orderGood.setGoodJson(JSON.toJSONString(goods1));
               break;
            }
         }
         orderGood.setDelFlag(0);
         orderGood.setCreateTime(LocalDateTime.now());