修改bug

puzhibing

2 天以前 0b9e60f0bada4cc39187a9dd3c36bf37452f63de

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

@@ -1,8 +1,10 @@
package com.ruoyi.order.controller.concole;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingResult;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.order.service.order.UserServiceRecordService;
@@ -19,6 +21,8 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * @author jqs34
@@ -231,8 +235,25 @@
    @ResponseBody
    @RequestMapping(value = "/addOrder", method = RequestMethod.POST)
    public R addOrder(@RequestBody AddOrderVo orderVo){
        Goods goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
        orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsNum(), orderVo.getId(), 2);
        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();
    }


    /**
     * 获取剩余服务类型对应的用户id
     * @param shopId
     * @return
     */
    @PostMapping("/getConsumerGoodsResidueUserId")
    public R<Set<Long>> getConsumerGoodsResidueUserId(@RequestParam("shopId") Long shopId, @RequestParam("goodsType") Integer goodsType){
        List<ConsumerGoods> list = consumerGoodsService.list(new QueryWrapper<ConsumerGoods>().eq("del_flag", 0)
                .eq("service_status", 1).eq("shop_id", shopId).eq("cycle_num_flag", 1).eq("goods_type", goodsType));
        Set<Long> collect = list.stream().map(ConsumerGoods::getUserId).collect(Collectors.toSet());
        return R.ok(collect);
    }
}