1.订单提交：订单最小金额配置

陶杰

2025-01-08 ae1471f378f399f76518539ec8992e64a3673436

 src/main/java/com/mzl/flower/web/v2/coupon/CouponTemplateAppController.java

@@ -7,22 +7,26 @@
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.dto.request.coupon.CreateCouponRecordAppDTO;
import com.mzl.flower.dto.request.coupon.CreateCouponRecordDTO;
import com.mzl.flower.dto.request.coupon.QueryActivityEffectCouponDTO;
import com.mzl.flower.dto.request.coupon.QueryMineCouponRecordDTO;
import com.mzl.flower.dto.response.coupon.CouponTemplateAppVO;
import com.mzl.flower.dto.response.coupon.CouponTemplateVO;
import com.mzl.flower.dto.response.customer.CustomerDTO;
import com.mzl.flower.entity.coupon.CouponTemplateDO;
import com.mzl.flower.enums.CouponCategoryEnum;
import com.mzl.flower.enums.CouponGetTypeEnum;
import com.mzl.flower.enums.CouponStatusEnum;
import com.mzl.flower.enums.CouponUsedStatusEnum;
import com.mzl.flower.mapper.customer.CustomerMapper;
import com.mzl.flower.service.coupon.CouponRecordService;
import com.mzl.flower.service.coupon.CouponTemplateService2;
import com.mzl.flower.utils.ConverterUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
@@ -45,16 +49,33 @@
    @Autowired
    CouponRecordService couponRecordService;

    @GetMapping("/home/list")

    @Autowired
   CustomerMapper customerMapper;

//    @GetMapping("/home/list")
//    @ApiOperation(value = "查询-首页弹框", notes = "查询-首页弹框")
//    public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> homeList(QueryActivityEffectCouponDTO dto) {
//        // 活动优惠券
//        dto.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
//        // 已经发布
//        dto.setStatus(CouponStatusEnum.ACTIVE.getStatus());
//        // 首页弹窗
//        dto.setGetType(CouponGetTypeEnum.HOME.getType());
//        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getActivityEffectList(dto), CouponTemplateAppVO.class));
//    }

    @GetMapping("/home/alert")
    @ApiOperation(value = "查询-首页弹框", notes = "查询-首页弹框")
    public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> homeList(QueryActivityEffectCouponDTO dto) {
    public ResponseEntity<ReturnDataDTO<CouponTemplateVO>> homeAlert(QueryActivityEffectCouponDTO dto) {
        // 活动优惠券
        dto.setCategory(CouponCategoryEnum.ACTIVITY.getStatus());
        // 已经发布
        dto.setStatus(CouponStatusEnum.ACTIVE.getStatus());
        // 首页弹窗
        dto.setGetType(CouponGetTypeEnum.HOME.getType());
        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getActivityEffectList(dto), CouponTemplateAppVO.class));
        // 如果当前人员已经领取过的话，则不返回
        return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(couponTemplateService.getHomeActivityEffectAlert(dto), CouponTemplateAppVO.class));
    }

    @GetMapping("/activy/list")
@@ -80,7 +101,11 @@
        // 首页弹窗
        dto.setGetType(CouponGetTypeEnum.CENTER.getType());

        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getActivityEffectList(dto), CouponTemplateAppVO.class));
        dto.setUserId(SecurityUtils.getUserId());

//        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getActivityEffectListWith(dto), CouponTemplateAppVO.class));

        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponTemplateService.getActivityEffectListWithMine(dto), CouponTemplateAppVO.class));

    }

@@ -92,6 +117,17 @@
        dto.setUserId(SecurityUtils.getUserId());

        return returnData(R.SUCCESS.getCode(), ConverterUtil.transList(couponRecordService.getMineCouponRecordList(dto), CouponTemplateAppVO.class));

    }

    @GetMapping("/mine/unused/fit")
    @ApiOperation(value = "我的优惠券-未使用", notes = "我的优惠券-未使用")
    public ResponseEntity<ReturnDataDTO<Page<CouponTemplateVO>>> unusedFit(QueryMineCouponRecordDTO dto) {
        // 未使用
        dto.setStatus(CouponUsedStatusEnum.UNUSED.getType());
        dto.setUserId(SecurityUtils.getUserId());

        return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(couponRecordService.getUnusedFit(dto), CouponTemplateAppVO.class) );

    }
    @GetMapping("/mine/used/list")
@@ -117,7 +153,7 @@

    @PostMapping("/receive")
    @ApiOperation(value = "优惠券领取", notes = "优惠券领取")
    public ResponseEntity<ReturnDataDTO> create(@Validated @RequestBody CreateCouponRecordDTO dto) {
    public ResponseEntity<ReturnDataDTO> create(@Validated @RequestBody CreateCouponRecordAppDTO dto) {

        final CouponTemplateDO couponTemplateDO = couponTemplateService.getById(dto.getCouponId());
        if(null==couponTemplateDO){
@@ -131,8 +167,18 @@
            throw new ValidationException("优惠券已下架");
        }

        // 根据当前获取获取商户的ID
        CustomerDTO currentCustomer = customerMapper.getCurrentCustomer(SecurityUtils.getUserId());
        if(null==currentCustomer){
            throw new ValidationException("当前登录的用户记录不存在");
        }
        // 设置当前用户为登录用户
        dto.setCustomerId(currentCustomer.getId());

        couponRecordService.createCouponRecord(dto);
        CreateCouponRecordDTO dtoTrans=new CreateCouponRecordDTO();
        BeanUtils.copyProperties(dto,dtoTrans);

        couponRecordService.createCouponRecord(dtoTrans);
        return returnData(R.SUCCESS.getCode(), null);
    }