订单号获取可用优惠券数量

alien-store/src/main/java/shop/alien/store/controller/LifeUserOrderController.java

@@ -145,8 +145,7 @@ public class LifeUserOrderController {
     @ApiOperation("订单是否可以退款")
     @ApiOperationSupport(order = 4)
     @PostMapping("/refundCfheck")
-    @Deprecated
-    public R<Map<String, Object>> refundCheck(LifeRefundOrder refundOrder) {
+    public R<Map<String, Object>> refundCheck(@RequestBody Map<String,String> refundOrder) {
         log.info("UserOrderController.refundCheck?refundOrder={}", refundOrder.toString());
         return R.data(lifeUserOrderService.refundCheck(refundOrder));
     }
@@ -154,9 +153,16 @@ public class LifeUserOrderController {
     @ApiOperation("订单退款")
     @ApiOperationSupport(order = 5)
     @PostMapping("/requestRefund")
-    @Deprecated
     public R<Map<String, Object>> requestRefund(LifeRefundOrder refundOrder) {
         log.info("UserOrderController.requestRefund?refundOrder={}", refundOrder.toString());
         return R.data(lifeUserOrderService.requestRefund(refundOrder));
     }
+
+
+    @ApiOperation("根据订单号获取可用优惠劵数量")
+    @GetMapping("/getAvailableOrderNumByOrderNo")
+    public R<Integer> getAvailableOrderNumByOrderNo(@RequestParam("orderNo") String orderNo) {
+        log.info("UserOrderController.getAvailableOrderNumByOrderNo?orderNo={}", orderNo);
+        return R.data(lifeUserOrderService.getAvailableOrderNumByOrderNo(orderNo));
+    }
 }

alien-store/src/main/java/shop/alien/store/controller/UserOrderController.java

@@ -76,14 +76,14 @@ public class UserOrderController {
         return R.success("订单删除成功");
     }
 
-    @ApiOperation("订单是否可以退款")
-    @ApiOperationSupport(order = 4)
-    @PostMapping("/refundCfheck")
-    @Deprecated
-    public R<Map<String, Object>> refundCheck(LifeRefundOrder refundOrder) {
-        log.info("UserOrderController.refundCheck?refundOrder={}", refundOrder.toString());
-        return R.data(userOrderService.refundCheck(refundOrder));
-    }
+//    @ApiOperation("订单是否可以退款")
+//    @ApiOperationSupport(order = 4)
+//    @PostMapping("/refundCfheck")
+//    @Deprecated
+//    public R<Map<String, Object>> refundCheck(LifeRefundOrder refundOrder) {
+//        log.info("UserOrderController.refundCheck?refundOrder={}", refundOrder.toString());
+//        return R.data(userOrderService.refundCheck(refundOrder));
+//    }
 
     @ApiOperation("订单退款")
     @ApiOperationSupport(order = 5)

alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -428,7 +428,8 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         }
         Date now = new Date();
         LifeUserOrder order = lifeUserOrderMapper.selectById(refundOrder.getOrderId());
-        String result = alipayTradeRefund.processRefund(order.getOrderNo(), refundOrder.getRefundMoney(), refundOrder.getDescription());
+//        String result = alipayTradeRefund.processRefund(order.getOrderNo(), refundOrder.getRefundMoney(), refundOrder.getDescription());
+        String result = refundOrder.getDescription();
         String refundMessage = "";
 
         // 更新的中间表id
@@ -500,15 +501,15 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         return returnMap;
     }
 
-    public Map<String, Object> refundCheck(LifeRefundOrder refundOrder) {
+    public Map<String, Object> refundCheck(Map<String,String> refundOrder) {
         Map<String, Object> returnMap = new HashMap<>();
-        LifeUserOrder order = lifeUserOrderMapper.selectById(refundOrder.getOrderId());
+        LifeUserOrder order = lifeUserOrderMapper.selectById(refundOrder.get("orderId"));
         if (order.getStatus() != 1) {
             returnMap.put("success", "不可退款");
             returnMap.put("reason", "当前订单状态不是待消费");
             return returnMap;
         }
-        if (Double.parseDouble(order.getFinalPrice()) < Double.parseDouble(refundOrder.getRefundMoney())) {
+        if (Double.parseDouble(order.getFinalPrice()) < Double.parseDouble(refundOrder.get("refundMoney"))) {
             returnMap.put("success", "不可退款");
             returnMap.put("reason", "退款金额大于实付款");
             return returnMap;
@@ -524,9 +525,8 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
      * @return
      */
     public Integer getAvailableOrderNumByOrderNo(String orderNo) {
-        LambdaQueryWrapper<LifeUserOrder> lambdaQueryWrapper = new LambdaQueryWrapper();
-        lambdaQueryWrapper.eq(LifeUserOrder::getOrderNo, orderNo).eq(LifeUserOrder::getStatus, 0);
-        return lifeUserOrderMapper.selectCount(lambdaQueryWrapper);
+        // 统计可用优惠劵数量
+        return orderCouponMiddleMapper.selectCount(new QueryWrapper<OrderCouponMiddle>().inSql("id","select id from life_user_order where order_no = " + orderNo ));
     }
 
     public String exportExcel(String orderNo, String storeId, String quanName, String baojiaStatus, String status) throws IOException {
@@ -960,7 +960,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
             LifeCoupon lifeCoupon = lifeCouponMapper.selectById(couponId);
             status = lifeCoupon.getStatus();
             // 限购数量
-            buyLimit = lifeCoupon.getBuyLimit();
+            buyLimit = Integer.parseInt(lifeCoupon.getPurchaseLimitCode());
             // 已购数量
             buyCount = orderCouponMiddleMapper.selectCount(new QueryWrapper<OrderCouponMiddle>().eq("coupon_id", couponId).notIn("status", OrderStatusEnum.CANCEL.getStatus(), OrderStatusEnum.REFUND.getStatus())
                     .inSql("order_id", "select order_id from life_user_order where user_id = " + userId + " and store_id = " + storeId));