管理台bug和用户端活动商品购买

jiangqs

2023-07-06 1f9b64476716a6a1de3bcb886bf4e64b123f7523

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java

@@ -11,14 +11,15 @@
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.annotation.Resource;
import java.util.List;

/**
@@ -33,13 +34,14 @@
@RequestMapping("/app/order")
public class AppOrderController extends BaseController {

    @Resource
    private RemoteMemberService memberService;


    @Autowired
    @Resource
    private OrderService orderService;


    /*@RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
    @RequestMapping(value = "/buyGoods", method = RequestMethod.POST)
    @ApiOperation(value = "购买商品")
    public R<AppSureOrderVo> buyGoods(@RequestBody AppSureOrderDto appSureOrderDto) {
        Long userId = SecurityUtils.getUserId();
@@ -52,6 +54,21 @@
        }
        AppSureOrderVo appSureOrderVo = orderService.buyGoods(appSureOrderDto);
        return R.ok(appSureOrderVo);
    }

    @RequestMapping(value = "/panicBuyGoods", method = RequestMethod.POST)
    @ApiOperation(value = "抢购商品")
    public R<AppPanicBuyVo> panicBuyGoods(@RequestBody AppPanicBuyDto appPanicBuyDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getMember(userId).getData();
            appPanicBuyDto.setUserId(userId);
            if(member!=null&&member.getRelationShopId()!=null){
                appPanicBuyDto.setShopId(member.getRelationShopId());
            }
        }
        AppPanicBuyVo panicBuyGoods = orderService.panicBuyGoods(appPanicBuyDto);
        return R.ok(panicBuyGoods);
    }

    @RequestMapping(value = "/placeOrder", method = RequestMethod.POST)
@@ -74,6 +91,29 @@
            }
        }
        AppPlaceOrderVo appPlaceOrderVo = orderService.placeOrder(appPlaceOrderDto);
        return R.ok(appPlaceOrderVo);
    }

    @RequestMapping(value = "/placeActivityOrder", method = RequestMethod.POST)
    @ApiOperation(value = "创建活动订单")
    public R<AppPlaceOrderVo> placeActivityOrder(@RequestBody AppPlaceActivityDto appPlaceActivityDto) {
        Long userId = SecurityUtils.getUserId();
        if(userId!=null){
            Member member = memberService.getMember(userId).getData();
            appPlaceActivityDto.setUserId(userId);
            if(member!=null&&member.getRelationShopId()!=null){
                appPlaceActivityDto.setShopId(member.getRelationShopId());
            }
            if(member.getBindingFlag()!=1){
                //绑定商户
                AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
                appMemberBindingDto.setShopId(appPlaceActivityDto.getShopId());
                appMemberBindingDto.setUserId(userId);
                appMemberBindingDto.setBindingFlag(1);
                memberService.updateMemberBinding(appMemberBindingDto);
            }
        }
        AppPlaceOrderVo appPlaceOrderVo = orderService.placeActivityOrder(appPlaceActivityDto);
        return R.ok(appPlaceOrderVo);
    }

@@ -136,6 +176,6 @@
        Long userId = SecurityUtils.getUserId();
        orderService.cancelOrder(appBaseGetDto.getId());
        return R.ok();
    }*/
    }

}