修改bug

puzhibing

昨天 c4b2a916399eee796bbf93d24bf41fd18c4d9f44

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java

@@ -9,12 +9,12 @@
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.service.order.OrderService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.model.AddOrderVo;
import com.ruoyi.system.api.service.RemoteGoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;
@@ -34,6 +34,9 @@

    @Resource
    private OrderService orderService;

    @Resource
    private RemoteGoodsService remoteGoodsService;


    @RequestMapping(value = "/verifyCode", method = RequestMethod.POST)
@@ -235,4 +238,17 @@
        return R.ok(page.setRecords(merOrderPageVoList));
    }

}

    /**
     * 抽奖的平台商品生成订单--待审核
     * @param orderVo
     * @return
     */
    @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);
        return R.ok();
    }
}