用户id

cash-api/account-server/src/main/java/com/czg/controller/user/UserShopCouponController.java

@@ -4,6 +4,7 @@ import com.czg.account.entity.ShopActivateCouponRecord;
 import com.czg.account.service.ShopCouponService;
 import com.czg.account.vo.UserCouponVo;
 import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.*;
@@ -30,10 +31,9 @@ public class UserShopCouponController {
      */
     @GetMapping("/findByUserId")
     public CzgResult<Page<ShopActivateCouponRecord>> findByUserId(
-            @RequestParam Long userId,
             @RequestParam(required = false) Integer status,
             @RequestParam(required = false) Long shopId) {
-        return CzgResult.success(couponService.find(userId, shopId, status));
+        return CzgResult.success(couponService.find(StpKit.USER.getLoginIdAsLong(), shopId, status));
     }
 
     /**

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java

@@ -155,7 +155,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     .gt(OrderInfo::getCreateTime, DateUtil.offsetDay(new Date(), -1))
                     .oneAs(HistoryOrderVo.class);
         } else {
-            historyOrderVo = getOneAs(new QueryWrapper().eq(OrderInfo::getId, orderId), HistoryOrderVo.class);
+            historyOrderVo = getOneAs(new QueryWrapper()
+                    .eq(OrderInfo::getId, orderId)
+                    .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode()), HistoryOrderVo.class);
         }
         if (historyOrderVo == null || historyOrderVo.getId() == null) {
             return null;

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java

@@ -530,6 +530,11 @@ public class PayServiceImpl implements PayService {
                     if (orderDetail.getReturnAmount().compareTo(orderDetail.getPayAmount()) > 0) {
                         throw new ValidateException("退单失败，" + orderDetail.getProductName() + "退单金额不正确");
                     }
+                    if (orderDetail.getNum().compareTo(orderDetail.getRefundNum().add(orderDetail.getReturnNum())) == 0) {
+                        orderDetail.setStatus(OrderStatusEnums.REFUND.getCode());
+                    } else {
+                        orderDetail.setStatus(OrderStatusEnums.PART_REFUND.getCode());
+                    }
                 } else {
                     orderDetail.setReturnNum(orderDetail.getRefundNum().add(refNum));
                     orderDetail.setPayAmount((orderDetail.getNum().subtract(orderDetail.getRefundNum()).subtract(orderDetail.getReturnNum())
@@ -537,21 +542,15 @@ public class PayServiceImpl implements PayService {
                 }
                 orderDetail.setRefundNo(refPayOrderNo);
                 orderDetail.setRefundRemark(orderDetail.getRefundRemark() + param.getRefundReason());
-                if (orderDetail.getNum().compareTo(orderDetail.getRefundNum().add(orderDetail.getReturnNum())) == 0) {
-                    orderDetail.setStatus(OrderStatusEnums.REFUND.getCode());
-                } else {
-                    orderDetail.setStatus(OrderStatusEnums.PART_REFUND.getCode());
-
-                }
                 orderDetailService.updateById(orderDetail);
                 returnProMap.put(orderDetail.getProductId(), refundDetail.getNum());
             }
             long count = orderDetailService.queryChain()
                     .eq(OrderDetail::getOrderId, orderInfo.getId())
                     .ne(OrderDetail::getStatus, OrderStatusEnums.REFUND.getCode()).count();
-            if (count > 0) {
+            if (count > 0 && isPay) {
                 orderInfo.setStatus(OrderStatusEnums.PART_REFUND.getCode());
-            } else {
+            } else if (isPay) {
                 orderInfo.setStatus(OrderStatusEnums.REFUND.getCode());
             }
         } else {
@@ -566,11 +565,12 @@ public class PayServiceImpl implements PayService {
                     returnProMap.put(orderDetail.getProductId(), orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum()));
                     orderDetail.setRefundNum(orderDetail.getNum().subtract(orderDetail.getReturnNum()));
                     orderDetail.setReturnAmount(orderDetail.getPayAmount());
+                    orderDetail.setStatus(OrderStatusEnums.REFUND.getCode());
                 } else {
                     returnProMap.put(orderDetail.getProductId(), orderDetail.getNum().subtract(orderDetail.getReturnNum()));
                     orderDetail.setReturnNum(orderDetail.getNum());
+                    orderDetail.setStatus(OrderStatusEnums.CANCELLED.getCode());
                 }
-                orderDetail.setStatus(OrderStatusEnums.REFUND.getCode());
             }
             orderDetailService.updateBatch(orderDetails);
         }