修改bug

mitao

2024-07-18 95639988ed630dae4b2461b5f6c3ccb6d9af8d86

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java

@@ -3,8 +3,8 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.OrderStatusEnum;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.order.service.IOrderService;
@@ -59,7 +59,7 @@

        LambdaQueryWrapper<Order> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(Order::getMemberId,OrderDTO.getMemberId());
        wrapper.eq(Order::getOrderStatus,4);
        wrapper.eq(Order::getOrderFrom,4);
        wrapper.eq(Order::getAuctionOrderType,2 );
        wrapper.eq(Order::getGoodsSkuId,OrderDTO.getGoodsSkuId());
        wrapper.eq(Order::getDelFlag,0);
@@ -131,6 +131,13 @@
    R<Order> getOrderByGroupPurchaseMemberId(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
        return R.ok(orderService.getOrderByGroupPurchaseMemberId(homeGoodsSkuDTO));
    }
    @InnerAuth
    @ResponseBody
    @PostMapping("/getOrderByGroupPurchaseMemberId1")
    R<Order> getOrderByGroupPurchaseMemberId1(@RequestBody HomeGoodsSkuDTO homeGoodsSkuDTO){
        return R.ok(orderService.getOrderByGroupPurchaseMemberId1(homeGoodsSkuDTO));
    }


    @InnerAuth
    @ResponseBody
@@ -163,4 +170,27 @@
    R<List<Order>> getOrderByCouponIds(@RequestBody Collection<Long> couponIds) {
        return R.ok(orderService.getOrderByCouponIds(couponIds));
    }
    @InnerAuth
    @GetMapping("/autoCancelOrder/{id}")
    R<?> autoCancelOrder(@PathVariable("id") Long oid) {
            Order byId = orderService.getById(oid);
            if (byId.getOrderStatus().getCode()==1){
                byId.setOrderStatus(OrderStatusEnum.CANCELED);
                orderService.updateById(byId);
            }
            return R.ok();
    }

    @InnerAuth
    @PostMapping("/getOrderListByMubres")
    R<List<Order>> getOrderListByMubres(@RequestBody List<String> mubres) {
        return R.ok(orderService.getOrderListByMubres(mubres));
    }

    @InnerAuth
    @PostMapping("/updOrderStatusByMubres")
    R<?> updateOrderStatusByMubres(@RequestBody List<String> formedGroupMubres) {
        orderService.updateOrderStatusByMubres(formedGroupMubres);
        return R.ok();
    }
}