修改bug

puzhibing

3 天以前 3417384c42ef6e7d99e98cef4e3bb4a016cfedea

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

@@ -5,10 +5,15 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.order.service.order.UserServiceRecordService;
import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
import com.ruoyi.system.api.domain.dto.BoardMemberTotalDto;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.AddOrderVo;
import com.ruoyi.system.api.service.RemoteGoodsService;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -31,6 +36,12 @@

    @Resource
    private ConsumerGoodsService consumerGoodsService;
    
    @Resource
    private UserServiceRecordService userServiceRecordService;

    @Resource
    private RemoteGoodsService remoteGoodsService;


    @PostMapping("/getAppOrderTotal")
@@ -55,9 +66,9 @@
    * @date 2023/6/18 17:30
    */
    @PostMapping("/boardOrderTotal")
    public R<MgtBulletinBoardVo> boardOrderTotal(){
    public R<MgtBulletinBoardVo> boardOrderTotal(@RequestBody BoardMemberTotalDto boardMemberTotalDto){
        MgtBulletinBoardVo mgtBulletinBoardVo = new MgtBulletinBoardVo();
        MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal();
        MgtBulletinBoardVo mgtBulletinBoardVoOrder = orderService.boardOrderTotal(boardMemberTotalDto.getUserIds());
        mgtBulletinBoardVo.setSalesTotal(mgtBulletinBoardVoOrder.getSalesTotal());
        mgtBulletinBoardVo.setUnUseOrderTotal(mgtBulletinBoardVoOrder.getUnUseOrderTotal());
        mgtBulletinBoardVo.setActivityOrderTotal(mgtBulletinBoardVoOrder.getActivityOrderTotal());
@@ -113,7 +124,7 @@
     */
    @PostMapping("/autoCancelOrder")
    public R autoCancelOrder(@RequestBody String orderId){
        orderService.autoCancelOrder(orderId);
        orderService.autoCancelOrder(orderId, 1);
        return R.ok();
    }

@@ -175,4 +186,56 @@
        ProfitSharingResult result = orderService.queryBill(orderId);
        return R.ok(result);
    }

    /**
     * 获取活动订单商品id
     * @param activityId
     * @return
     */
    @PostMapping("/getActivityOrderGoods")
    public R<List<String>> getActivityOrderGoods(@RequestBody String activityId){
        List<String> activityOrderGoods = orderService.getActivityOrderGoods(activityId);
        return R.ok(activityOrderGoods);
    }

    /**
     * 获取商品售卖统计
     * @param goodsIdList
     * @return
     */
    @PostMapping("/getGoodsSellStatic")
    R<StaticsShopMgtGoodsVO> getGoodsSellStatic(@RequestBody List<String> goodsIdList){
        StaticsShopMgtGoodsVO vo = orderService.getGoodsSellStatic(goodsIdList);
        vo.setGoodsNum(goodsIdList.size());
        return R.ok(vo);
    }
    
    
    /**
     * 获取今日到店用户
     * @param shopId
     * @return
     */
    @PostMapping("/countShopServicePerson")
    public R<List<Integer>> countShopServicePerson(@RequestParam("shopId") Long shopId){
        List<Integer> list = userServiceRecordService.countShopServicePerson(shopId);
        return R.ok(list);
    }


    /**
     * 抽奖的平台商品生成订单--待审核
     * @param orderVo
     * @return
     */
    @ResponseBody
    @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
    public R addOrder(@RequestBody AddOrderVo orderVo){
        Goods goods = null;
        if(null != orderVo.getGoodsId()){
            goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
        }
        orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsName(), orderVo.getGoodsNum(), orderVo.getId(), 2);
        return R.ok();
    }
}