合并代码

puzhibing

2024-12-10 7cbb9f42f6f9430aae846ae25b7ad77a82528927

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

@@ -368,7 +368,22 @@
    */
   @Override
   public ConfirmOrderVo confirmOrder(ConfirmOrder confirmOrder) {
      Integer position = confirmOrder.getPosition();
      Long userid = tokenService.getLoginUserApplet().getUserid();
      //直接购买商品
      if(2 == position){
         //先加入购物车
         String goodsJson = confirmOrder.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);
         confirmOrder.setGoodsJson("[{\"id\": " + shoppingCarId + ", \"num\": " + num1 + "}]");
      }
      AppUser appUser = appUserClient.getAppUserById(userid);
      Integer shopId = confirmOrder.getShopId();
      Shop shop = shopClient.getShopById(shopId).getData();
@@ -413,6 +428,7 @@
      confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
      //获取默认收货地址
      UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
      userAddress.setIdStr(userAddress.getId().toString());
      confirmOrderVo.setUserAddress(userAddress);
      confirmOrderVo.setPaymentType(confirmOrder.getPaymentType());
      //获取用户优惠券，用户全部优惠券，不能使用的需要标识出来置灰展示
@@ -571,22 +587,7 @@
    */
   @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();
@@ -811,7 +812,7 @@
      order.setGoodName(goodName.substring(0, goodName.length() - 1));
      Goods goods = goodsClient.getGoodsById(goodsList.get(0).getGoodsId()).getData();
      order.setOrderType(goods.getType());
      order.setOrderStatus(1);
      order.setOrderStatus(goods.getType() == 1 ? 3 : 1);
      SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
      order.setOrderNumber("QJS" + getNumber(3) + sdf.format(new Date()));
      order.setTotalAmount(orderMoney.setScale(2, RoundingMode.HALF_EVEN));
@@ -1055,7 +1056,7 @@
            this.removeBatchByIds(ids);
         }
      }
      return R.ok();
      return R.ok(order.getId().toString());
   }