Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 6f54cebf07887237f5eb8efdf9d1d0b784dbaa49

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

@@ -327,10 +327,11 @@
   

   @Override
   public void addGoods(ShoppingCart shoppingCart) {
   public Long addGoods(ShoppingCart shoppingCart) {
      Long userid = tokenService.getLoginUserApplet().getUserid();
      shoppingCart.setAppUserId(userid);
      this.save(shoppingCart);
      return shoppingCart.getId();
   }
   
   
@@ -571,7 +572,22 @@
    */
   @Override
   public R shoppingCartPayment(ShoppingCartPayment shoppingCartPayment) {
      Integer position = shoppingCartPayment.getPosition();
      Long userid = tokenService.getLoginUserApplet().getUserid();
      //直接购买商品
      if(2 == position){
         //先加入购物车
         String goodsJson = shoppingCartPayment.getGoodsJson();
         JSONArray objects = JSON.parseArray(goodsJson);
         Long id = objects.getJSONObject(0).getLong("id");
         Integer num1 = objects.getJSONObject(0).getInteger("num");
         ShoppingCart shoppingCart = new ShoppingCart();
         shoppingCart.setAppUserId(userid);
         shoppingCart.setGoodsId(id.intValue());
         shoppingCart.setNumber(num1);
         Long shoppingCarId = addGoods(shoppingCart);
         shoppingCartPayment.setGoodsJson("[{\"id\": " + shoppingCarId + ", \"num\": " + num1 + "}]");
      }
      AppUser appUser = appUserClient.getAppUserById(userid);
      Integer shopId = shoppingCartPayment.getShopId();
      String goodsJson = shoppingCartPayment.getGoodsJson();