ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ShoppingCartController.java
@@ -52,13 +52,13 @@ @ResponseBody @GetMapping("/getMyShoppingCart/{type}/{shopId}") @GetMapping("/getMyShoppingCart") @ApiOperation(value = "获取购物车列表", tags = {"商城-购物车-小程序"}) @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "商品类型（1=服务商品，2=单品商品）", required = true, dataType = "int"), @ApiImplicitParam(name = "shopId", value = "核销门店id", required = true, dataType = "int") }) public TableDataInfo<MyShoppingCartVo> getMyShoppingCart(@PathVariable("type") Integer type, @PathVariable("shopId") Integer shopId){ public TableDataInfo<MyShoppingCartVo> getMyShoppingCart(Integer type, Integer shopId){ startPage(); return getDataTable(shoppingCartService.getMyShoppingCart(type, shopId)); } ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -495,7 +495,7 @@ //开始退款 Integer payMethod = order.getPayMethod(); BigDecimal expressAmount = order.getExpressAmount() == null ? BigDecimal.ZERO : order.getExpressAmount(); BigDecimal paymentAmount = order.getPaymentAmount().add(expressAmount); BigDecimal paymentAmount = order.getPaymentAmount(); AppUser appUser = appUserClient.getAppUserById(order.getAppUserId()); if (1 == payMethod) { //微信退款 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -430,7 +430,6 @@ } AppUser appUser = appUserClient.getAppUserById(userid); Integer shopId = confirmOrder.getShopId(); Shop shop = shopClient.getShopById(shopId).getData(); String goodsJson = confirmOrder.getGoodsJson(); List<Long> ids = new ArrayList<>(); JSONArray objects = JSON.parseArray(goodsJson); @@ -443,8 +442,11 @@ //构建商品明细列表 List<MyShoppingCartVo> goodsList = buildDetail(appUser, shopId, list, objects); confirmOrderVo.setGoodsList(goodsList); confirmOrderVo.setShopId(confirmOrder.getShopId()); confirmOrderVo.setShopName(shop.getName()); if(null != confirmOrder.getShopId()){ Shop shop = shopClient.getShopById(shopId).getData(); confirmOrderVo.setShopId(confirmOrder.getShopId()); confirmOrderVo.setShopName(null == shop ? "" : shop.getName()); } //现金支付 if(confirmOrder.getPaymentType() == 1){ BigDecimal bigDecimal = BigDecimal.ZERO;
