gongzuming
2024-10-24 3db677d8ad84f04b84ba2c74f7fc0dd7e5df239d
src/main/java/com/mzl/flower/web/customer/FlowerCustomerController.java
@@ -19,6 +19,7 @@
import com.mzl.flower.service.flower.FlowerParamService;
import com.mzl.flower.service.flower.FlowerService;
import com.mzl.flower.service.payment.OrderService;
import com.mzl.flower.service.statistics.StatisticsService;
import com.mzl.flower.service.transport.TransportService;
import com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse;
import com.wechat.pay.java.service.payments.jsapi.model.PrepayWithRequestPaymentResponse;
@@ -32,6 +33,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.validation.ValidationException;
import javax.validation.constraints.NotBlank;
import java.util.HashMap;
@@ -59,10 +61,13 @@
    @Autowired
    private TransportService transportService;
    @Autowired
    private StatisticsService statisticsService;
    @GetMapping("/category/tree")
    @ApiOperation(value = "获取商品分类树")
    public ResponseEntity<ReturnDataDTO<List<FlowerCategoryTreeDTO>>> selectCategoryTree(FlowerCategoryQueryDTO dto){
    public ResponseEntity<ReturnDataDTO<List<FlowerCategoryTreeDTO>>> selectCategoryTree(FlowerCategoryQueryDTO dto, HttpServletRequest request){
        statisticsService.addUserAccessRecord(request);
        return returnData(R.SUCCESS.getCode(), categoryService.selectCustomerCategoryTree(dto));
    }
@@ -97,7 +102,8 @@
            @ApiImplicitParam(name = "id", value = "商品id", required = true, dataType = "Long", paramType = "query"),
            @ApiImplicitParam(name = "partnerId", value = "合伙人id", required = true, dataType = "Long", paramType = "query"),
    })
    public ResponseEntity<ReturnDataDTO<FlowerShowDTO>> getShowFlowerDetail(Long id, Long partnerId) {
    public ResponseEntity<ReturnDataDTO<FlowerShowDTO>> getShowFlowerDetail(Long id, Long partnerId,HttpServletRequest request) {
        statisticsService.addUserAccessRecord(request);
        return returnData(R.SUCCESS.getCode(), flowerService.getShowFlowerDetail(id, partnerId));
    }
@@ -133,7 +139,7 @@
    @PostMapping("/cart/delete/batch")
    @ApiOperation(value = "批量删除购物车商品")
    public ResponseEntity<ReturnDataDTO<?>> deleteBatchFlower4Cart(CartDeleteDTO dto){
    public ResponseEntity<ReturnDataDTO<?>> deleteBatchFlower4Cart(@RequestBody CartDeleteDTO dto){
        if(dto == null || CollectionUtils.isEmpty(dto.getIds())){
            throw new ValidationException("ids不能为空");
        }
@@ -169,7 +175,7 @@
    @PostMapping("/order/commit")
    @ApiOperation(value = "提交订单")
    public ResponseEntity<ReturnDataDTO<?>> commitOrder(@RequestBody OrderCommitDTO dto){
    public ResponseEntity<ReturnDataDTO<?>> commitOrder(@RequestBody OrderCommitDTO dto) throws Exception {
        Map<Long, PriceDTO > priceMap = new HashMap<>();
        PreOrderDTO p = orderService.processPreOrderInfo(dto.getFlowers(), priceMap);
        Map map;