merge master

src/main/java/com/peanut/modules/book/controller/BuyOrderController.java

@@ -227,6 +227,84 @@ public class BuyOrderController {
         return R.ok();
     }
 
+
+    /**
+     * app 端 取消订单
+     */
+    @RequestMapping("/appDelete")
+    @Transactional
+    public R appDelete(@RequestParam("orderId") Integer orderId) {
+
+        //1.  判断订单状态
+        BuyOrder byId = buyOrderService.getById(orderId);
+        if (byId != null) {
+            //2.  判断当前订单是否存在优惠券   进行 回显
+            Integer couponId = byId.getCouponId();
+            if (couponId != null) {
+
+                CouponHistoryEntity byId1 = couponHistoryService.getById(couponId);
+                byId1.setUseStatus(0);
+                couponHistoryService.updateById(byId1);
+            }
+            //   库存回滚
+            List<BuyOrderDetail> buyOrderDetailEntities = buyOrderDetailService.getBaseMapper().selectList(new QueryWrapper<BuyOrderDetail>()
+                    .eq("order_id", byId.getOrderId()));
+            for (BuyOrderDetail buyOrderDetailEntity : buyOrderDetailEntities) {
+                Integer productId = buyOrderDetailEntity.getProductId();
+                ShopProductEntity product = shopProductService.getById(productId);
+                product.setProductStock(product.getProductStock() + buyOrderDetailEntity.getQuantity());
+                shopProductService.updateById(product);
+            }
+            buyOrderService.removeById(orderId);
+        }
+        return R.ok();
+    }
+
+
+    /**
+     * 充值专用订单生成接口
+     */
+    @RequestMapping("/rechargeSave")
+    @Transactional
+    public R rechargeSave(@RequestBody BuyOrder buyOrder) throws IOException {
+        String timeId = IdWorker.getTimeId().substring(0, 32);
+        buyOrder.setOrderSn(timeId);
+        buyOrderService.save(buyOrder);
+        //下单微信支付预付款订单
+        BuyOrder buyOrderEntity = buyOrderService.getBaseMapper().selectOne(new LambdaQueryWrapper<BuyOrder>().eq(BuyOrder::getOrderSn, timeId));
+        WechatPaymentInfo paymentInfo = new WechatPaymentInfo();
+        paymentInfo.setOrderSn(buyOrderEntity.getOrderSn());
+        paymentInfo.setBuyOrderId(Integer.valueOf(buyOrderEntity.getProductId()));
+        paymentInfo.setTotalAmount(buyOrderEntity.getRealMoney());
+        wxpayService.prepay(paymentInfo);
+        return R.ok().put("orderSn", timeId);
+    }
+
+    /**
+     * 获取订单详情
+     *
+     * @param orderId
+     * @return
+     */
+    @RequestMapping("/getOrderDetail")
+    public R getOrderDetail(@RequestParam Integer orderId) {
+        LambdaQueryWrapper<BuyOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BuyOrder::getOrderId, orderId);
+        BuyOrder one = buyOrderService.getOne(wrapper);
+        if (one.equals(null)) {
+            return R.error("order error:order is null");
+        }
+        //添加用户信息
+        one.setUser(myUserService.getById(one.getUserId()));
+        //添加商品信息
+        LambdaQueryWrapper<BuyOrderDetail> wrapper1 = new LambdaQueryWrapper<>();
+        wrapper1.eq(BuyOrderDetail::getOrderId, orderId);
+        List<BuyOrderDetail> buyOrderDetailEntities = buyOrderDetailService.getBaseMapper().selectList(wrapper1);
+        one.setProducts(buyOrderDetailEntities);
+
+        return R.ok().put("detail", one);
+    }
+
     /**
      * 获取订单详情
      *