管理台bug和用户端生日卡

jiangqs

2023-07-07 5627daeb1ac1a29947e902f9a7efb6730ed98611

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

@@ -1,7 +1,9 @@
package com.ruoyi.order.controller.concole;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.vo.AppOrderTotalVo;
@@ -30,6 +32,9 @@

    @Resource
    private OrderService orderService;

    @Resource
    private ConsumerGoodsService consumerGoodsService;


    @PostMapping("/getAppOrderTotal")
@@ -89,4 +94,16 @@
        return R.ok(unpaidMoney);
    }

    /**
     * @description  发送用户商品礼物
     * @author  jqs
     * @date    2023/7/7 19:53
     * @param giftSendDtoList
     * @return  R
     */
    @PostMapping("/sendGoodsGift")
    public R sendGoodsGift(@RequestBody List<BirthdayGiftSendDto> giftSendDtoList){
        consumerGoodsService.sendGoodsGift(giftSendDtoList);
        return R.ok();
    }
}