优惠券使用

pull/1/head
wqy 2 years ago
parent 9d043d9b8c
commit d2007f9204

@ -16,6 +16,7 @@ public class OrderSubmitForm {
private Integer payType = 2; private Integer payType = 2;
/** 订单来源购物车则为cart */ /** 订单来源购物车则为cart */
private String from; private String from;
private Long memberCouponId;
@NotEmpty @NotEmpty
private List<OrderProductListDTO> skuList; private List<OrderProductListDTO> skuList;
@Data @Data

@ -30,6 +30,8 @@ public class H5OrderVO {
@ApiModelProperty("应付金额") @ApiModelProperty("应付金额")
private BigDecimal payAmount; private BigDecimal payAmount;
private BigDecimal couponAmount;
@ApiModelProperty("订单状态 0->待付款1->待发货2->已发货3->已完成4->已关闭") @ApiModelProperty("订单状态 0->待付款1->待发货2->已发货3->已完成4->已关闭")
private Integer status; private Integer status;

@ -1,5 +1,6 @@
package com.cyl.h5.domain.vo; package com.cyl.h5.domain.vo;
import com.cyl.manager.act.domain.entity.MemberCoupon;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -16,4 +17,5 @@ public class OrderCalcVO {
private BigDecimal productTotalAmount; private BigDecimal productTotalAmount;
@ApiModelProperty("订单总金额") @ApiModelProperty("订单总金额")
private BigDecimal orderTotalAmount; private BigDecimal orderTotalAmount;
private List<MemberCoupon> couponList;
} }

@ -17,7 +17,10 @@ import com.cyl.h5.domain.form.OrderPayForm;
import com.cyl.h5.domain.vo.OrderPayVO; import com.cyl.h5.domain.vo.OrderPayVO;
import com.cyl.h5.domain.vo.*; import com.cyl.h5.domain.vo.*;
import com.cyl.h5.domain.form.OrderSubmitForm; import com.cyl.h5.domain.form.OrderSubmitForm;
import com.cyl.manager.act.domain.entity.MemberCoupon;
import com.cyl.manager.act.mapper.MemberCouponMapper;
import com.cyl.manager.act.service.IntegralHistoryService; import com.cyl.manager.act.service.IntegralHistoryService;
import com.cyl.manager.act.service.MemberCouponService;
import com.cyl.manager.oms.convert.AftersaleItemConvert; import com.cyl.manager.oms.convert.AftersaleItemConvert;
import com.cyl.manager.oms.convert.OrderItemConvert; import com.cyl.manager.oms.convert.OrderItemConvert;
import com.cyl.manager.oms.mapper.*; import com.cyl.manager.oms.mapper.*;
@ -54,8 +57,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -124,6 +129,9 @@ public class H5OrderService {
@Autowired @Autowired
private IntegralHistoryService integralHistoryService; private IntegralHistoryService integralHistoryService;
@Autowired
private MemberCouponService memberCouponService;
@Transactional @Transactional
public Long submit(OrderSubmitForm form) { public Long submit(OrderSubmitForm form) {
Member member = (Member) LocalDataUtil.getVar(Constants.MEMBER_INFO); Member member = (Member) LocalDataUtil.getVar(Constants.MEMBER_INFO);
@ -147,6 +155,35 @@ public class H5OrderService {
Map<Long, Sku> querySkuMap = skuMapper Map<Long, Sku> querySkuMap = skuMapper
.selectBatchIds(skuList.stream().map(OrderProductListDTO::getSkuId).collect(Collectors.toList())) .selectBatchIds(skuList.stream().map(OrderProductListDTO::getSkuId).collect(Collectors.toList()))
.stream().collect(Collectors.toMap(Sku::getId, it -> it)); .stream().collect(Collectors.toMap(Sku::getId, it -> it));
//校验优惠券
BigDecimal couponAmount = BigDecimal.ZERO;
if (form.getMemberCouponId() != null) {
MemberCoupon coupon = memberCouponService.selectValidCoupon(form.getMemberCouponId());
if (coupon == null) {
throw new RuntimeException("优惠券未找到");
}
//将sku转换成products
Map<Long, Product> products = new HashMap<>();
querySkuMap.forEach((k, v) -> {
Integer count = skuQuantityMap.get(k);
Long productId = v.getProductId();
Product product;
BigDecimal amount = v.getPrice().multiply(BigDecimal.valueOf(count));
if (products.containsKey(k)) {
product = products.get(k);
product.setPrice(amount.add(product.getPrice()));
} else {
product = new Product();
product.setId(productId);
product.setPrice(amount);
}
products.put(k, product);
});
if (!memberCouponService.judgeCouponCanUse(coupon, products.values())) {
throw new RuntimeException("优惠券未达到使用条件");
}
couponAmount = coupon.getCouponAmount();
}
//计算商品总额、订单总额(订单总金额=商品总金额,因为暂时没有运费等概念) //计算商品总额、订单总额(订单总金额=商品总金额,因为暂时没有运费等概念)
BigDecimal productTotalAmount = BigDecimal.ZERO; BigDecimal productTotalAmount = BigDecimal.ZERO;
BigDecimal orderTotalAmount = BigDecimal.ZERO; BigDecimal orderTotalAmount = BigDecimal.ZERO;
@ -184,11 +221,18 @@ public class H5OrderService {
order.setMemberId(member.getId()); order.setMemberId(member.getId());
order.setMemberUsername(member.getNickname()); order.setMemberUsername(member.getNickname());
order.setPayType(Constants.PayType.WECHAT); order.setPayType(Constants.PayType.WECHAT);
order.setCouponAmount(couponAmount);
order.setMemberCouponId(form.getMemberCouponId());
order.setTotalAmount(orderTotalAmount); order.setTotalAmount(orderTotalAmount);
order.setPurchasePrice(BigDecimal.ZERO); order.setPurchasePrice(BigDecimal.ZERO);
order.setFreightAmount(BigDecimal.ZERO); order.setFreightAmount(BigDecimal.ZERO);
order.setPayAmount(orderTotalAmount); BigDecimal subtract = orderTotalAmount.subtract(couponAmount);
order.setPayAmount(subtract.compareTo(BigDecimal.ZERO) > 0 ? subtract : BigDecimal.ZERO);
if (order.getPayAmount().compareTo(BigDecimal.ZERO) == 0) {
order.setStatus(Constants.OrderStatus.SEND);
} else {
order.setStatus(Constants.OrderStatus.NOTPAID); order.setStatus(Constants.OrderStatus.NOTPAID);
}
order.setAftersaleStatus(1); order.setAftersaleStatus(1);
order.setReceiverName(memberAddress.getName()); order.setReceiverName(memberAddress.getName());
order.setReceiverPhone(memberAddress.getPhoneHidden()); order.setReceiverPhone(memberAddress.getPhoneHidden());
@ -241,6 +285,10 @@ public class H5OrderService {
} }
} }
//当前订单id接入支付后可返回payId //当前订单id接入支付后可返回payId
//如果是使用了优惠券,更新优惠券状态
if (form.getMemberCouponId() != null) {
memberCouponService.updateCouponStatus(form.getMemberCouponId(), orderId);
}
return payId; return payId;
} }
@ -294,6 +342,24 @@ public class H5OrderService {
res.setSkuList(skuList); res.setSkuList(skuList);
res.setOrderTotalAmount(orderTotalAmount); res.setOrderTotalAmount(orderTotalAmount);
res.setProductTotalAmount(productTotalAmount); res.setProductTotalAmount(productTotalAmount);
//获取能使用的优惠券列表
Map<Long, Product> products = new HashMap<>();
querySkuMap.forEach((k, v) -> {
Integer count = quantityMap.get(k);
Long productId = v.getProductId();
Product product;
BigDecimal amount = v.getPrice().multiply(BigDecimal.valueOf(count));
if (products.containsKey(k)) {
product = products.get(k);
product.setPrice(amount.add(product.getPrice()));
} else {
product = new Product();
product.setId(productId);
product.setPrice(amount);
}
products.put(k, product);
});
res.setCouponList(memberCouponService.getCanUseList(products.values()));
return res; return res;
} }
@ -305,6 +371,7 @@ public class H5OrderService {
/** /**
* h5 * h5
*
* @param status -1->0->1->2->-2-> * @param status -1->0->1->2->-2->
* @param memberId id * @param memberId id
* @param pageable * @param pageable
@ -391,6 +458,7 @@ public class H5OrderService {
orderOperateHistoryMapper.insert(optHistory); orderOperateHistoryMapper.insert(optHistory);
}); });
} }
@Transactional @Transactional
public String orderComplete(Long orderId) { public String orderComplete(Long orderId) {
LocalDateTime optDate = LocalDateTime.now(); LocalDateTime optDate = LocalDateTime.now();
@ -427,6 +495,7 @@ public class H5OrderService {
/** /**
* *
*
* @param memberId * @param memberId
* @return * @return
*/ */
@ -490,11 +559,17 @@ public class H5OrderService {
if (!flag) { if (!flag) {
throw new RuntimeException("创建订单操作记录失败"); throw new RuntimeException("创建订单操作记录失败");
} }
//判断是否使用优惠券,有的话,把优惠券还回去
List<Long> couponIdList = orderList.stream().filter(it -> it.getMemberCouponId() != null).map(Order::getMemberCouponId).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(couponIdList)) {
memberCouponService.backCoupon(couponIdList);
}
return "取消订单成功"; return "取消订单成功";
} }
/** /**
* *
*
* @param req * @param req
* @return * @return
*/ */
@ -582,6 +657,7 @@ public class H5OrderService {
/** /**
* *
*
* @param messageDTO * @param messageDTO
* @return * @return
*/ */
@ -648,6 +724,7 @@ public class H5OrderService {
/** /**
* *
*
* @param applyRefundForm * @param applyRefundForm
* @return * @return
*/ */
@ -730,6 +807,7 @@ public class H5OrderService {
/** /**
* check * check
*
* @param order * @param order
*/ */
private void checkIfCanApplyRefund(Order order) { private void checkIfCanApplyRefund(Order order) {
@ -754,6 +832,7 @@ public class H5OrderService {
/** /**
* *
*
* @param orderId id * @param orderId id
* @return * @return
*/ */
@ -801,6 +880,7 @@ public class H5OrderService {
/** /**
* *
*
* @param orderId id * @param orderId id
* @return * @return
*/ */

@ -16,6 +16,8 @@ import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(description = "优惠券接口列表") @Api(description = "优惠券接口列表")
@RestController @RestController
@RequestMapping("/h5/coupon") @RequestMapping("/h5/coupon")
@ -67,4 +69,16 @@ public class H5CouponController {
return ResponseEntity.ok(memberCouponService.selectListByH5(query, page)); return ResponseEntity.ok(memberCouponService.selectListByH5(query, page));
} }
/**
*
*
* @param query
* @return
*/
@PostMapping("/can/use/list")
public ResponseEntity<List<MemberCoupon>> getCanUseList(@RequestBody MemberCouponQuery query) {
return ResponseEntity.ok(memberCouponService.getCanUseList(query.getProducts()));
}
} }

@ -2,6 +2,9 @@ package com.cyl.manager.act.domain.query;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List;
import com.cyl.manager.pms.domain.entity.Product;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -26,5 +29,7 @@ public class MemberCouponQuery {
//1已领取 2已使用 3已过期 //1已领取 2已使用 3已过期
private Integer type; private Integer type;
private List<Product> products;
} }

@ -1,30 +1,28 @@
package com.cyl.manager.act.service; package com.cyl.manager.act.service;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.cyl.h5.config.SecurityUtil; import com.cyl.h5.config.SecurityUtil;
import com.cyl.manager.act.domain.entity.MemberCoupon;
import com.cyl.manager.act.domain.query.MemberCouponQuery;
import com.cyl.manager.act.domain.vo.MemberCouponVO; import com.cyl.manager.act.domain.vo.MemberCouponVO;
import com.cyl.manager.act.mapper.MemberCouponMapper;
import com.cyl.manager.pms.domain.entity.Product;
import com.cyl.manager.ums.domain.entity.Member; import com.cyl.manager.ums.domain.entity.Member;
import com.cyl.manager.ums.mapper.MemberMapper; import com.cyl.manager.ums.mapper.MemberMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.google.gson.JsonObject;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.cyl.manager.act.mapper.MemberCouponMapper; import org.springframework.util.CollectionUtils;
import com.cyl.manager.act.domain.entity.MemberCoupon;
import com.cyl.manager.act.domain.query.MemberCouponQuery; import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
/** /**
* Service * Service
@ -48,6 +46,24 @@ public class MemberCouponService {
return memberCouponMapper.selectById(id); return memberCouponMapper.selectById(id);
} }
public MemberCoupon selectValidCoupon(Long id) {
MemberCoupon coupon = memberCouponMapper.selectById(id);
if (coupon == null) {
return null;
}
if (Objects.equals(coupon.getUseStatus(), 1)) {
throw new RuntimeException("优惠券已使用");
}
LocalDateTime now = LocalDateTime.now();
if (coupon.getBeginTime().isAfter(now)) {
throw new RuntimeException("优惠券未到开始使用日期");
}
if (coupon.getEndTime().isBefore(now)) {
throw new RuntimeException("优惠券已过期");
}
return coupon;
}
/** /**
* *
* *
@ -157,4 +173,85 @@ public class MemberCouponService {
return new PageImpl<>(list, page, ((com.github.pagehelper.Page) list).getTotal()); return new PageImpl<>(list, page, ((com.github.pagehelper.Page) list).getTotal());
} }
public List<MemberCoupon> getCanUseList(Collection<Product> products) {
//先获取我的未过期的优惠券
QueryWrapper<MemberCoupon> queryWrapper = new QueryWrapper<>();
LocalDateTime now = LocalDateTime.now();
queryWrapper.eq("member_id", SecurityUtil.getLocalMember().getId())
.eq("use_status", 0)
.ge("end_time", now)
.le("begin_time", now);
List<MemberCoupon> list = memberCouponMapper.selectList(queryWrapper);
if (CollectionUtils.isEmpty(list)) {
return list;
}
List<MemberCoupon> matchList = new ArrayList<>();
list.forEach(item -> {
if (judgeCouponCanUse(item, products)) {
matchList.add(item);
}
});
return matchList;
}
public Boolean judgeCouponCanUse(MemberCoupon item, Collection<Product> products) {
//判断是否满足菜品
if (!Objects.equals(1, item.getUseScope())) {
List<Long> couponProducts = Arrays.stream(item.getProductIds().split(",")).map(it -> Long.parseLong(it)).collect(Collectors.toList());
if (Objects.equals(2, item.getUseScope()) && products.stream().noneMatch(it -> couponProducts.contains(it.getId()))) {
//指定商品
return false;
}
if (Objects.equals(3, item.getUseScope()) && products.stream().anyMatch(it -> couponProducts.contains(it.getId()))) {
//指定商品不包括
return false;
}
}
//计算金额是否满足
if (item.getMinAmount() == null || item.getMinAmount().equals(BigDecimal.ZERO)) {
//无门槛
return true;
}
if (item.getMinAmount().compareTo(calcMinAmount(products, item)) <= 0) {
return true;
}
return false;
}
private BigDecimal calcMinAmount(Collection<Product> products, MemberCoupon coupon) {
List<Long> ids;
if (!Objects.equals(1, coupon.getUseScope())) {
ids = Arrays.stream(coupon.getProductIds().split(",")).map(it -> Long.parseLong(it)).collect(Collectors.toList());
} else {
ids = new ArrayList<>();
}
switch (coupon.getUseScope()) {
case 1:
return products.stream().map(Product::getPrice).reduce(BigDecimal::add).get();
case 2:
return products.stream().filter(it -> ids.contains(it.getId())).map(Product::getPrice).reduce(BigDecimal::add).get();
case 3:
return products.stream().filter(it -> !ids.contains(it.getId())).map(Product::getPrice).reduce(BigDecimal::add).get();
default:
return BigDecimal.ZERO;
}
}
public void updateCouponStatus(Long memberCouponId, Long orderId) {
UpdateWrapper<MemberCoupon> updateWrapper = new UpdateWrapper<>();
updateWrapper.eq("id", memberCouponId)
.set("use_status", 1)
.set("use_time", LocalDateTime.now())
.set("order_id", orderId);
memberCouponMapper.update(null, updateWrapper);
}
public void backCoupon(List<Long> couponIdList) {
UpdateWrapper<MemberCoupon> updateWrapper = new UpdateWrapper<>();
updateWrapper.in("id", couponIdList)
.set("use_status", 0)
.set("use_time", null)
.set("order_id", null);
memberCouponMapper.update(null, updateWrapper);
}
} }

@ -153,4 +153,10 @@ public class Order extends BaseAudit {
@Excel(name = "确认收货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "确认收货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime receiveTime; private LocalDateTime receiveTime;
@ApiModelProperty("优惠券ID")
private Long memberCouponId;
@ApiModelProperty("优惠券金额")
private BigDecimal couponAmount;
} }

@ -43,4 +43,5 @@ public class ManagerOrderDetailVO {
private BigDecimal payAmount; private BigDecimal payAmount;
@ApiModelProperty("订单金额") @ApiModelProperty("订单金额")
private BigDecimal totalAmount; private BigDecimal totalAmount;
private BigDecimal couponAmount;
} }

@ -99,4 +99,6 @@ public class ManagerOrderVO {
private String receiverDetailAddress; private String receiverDetailAddress;
private String mark; private String mark;
private BigDecimal couponAmount;
} }

@ -95,6 +95,7 @@ public class OrderService {
ManagerOrderDetailVO managerOrderDetailVO = new ManagerOrderDetailVO(); ManagerOrderDetailVO managerOrderDetailVO = new ManagerOrderDetailVO();
//封装订单信息 //封装订单信息
managerOrderDetailVO.setOrderId(id); managerOrderDetailVO.setOrderId(id);
managerOrderDetailVO.setCouponAmount(order.getCouponAmount());
managerOrderDetailVO.setOrderSn(order.getOrderSn()); managerOrderDetailVO.setOrderSn(order.getOrderSn());
managerOrderDetailVO.setOrderStatus(order.getStatus()); managerOrderDetailVO.setOrderStatus(order.getStatus());
managerOrderDetailVO.setCreateTime(order.getCreateTime()); managerOrderDetailVO.setCreateTime(order.getCreateTime());

@ -109,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.receiver_name receiverName, a.receiver_name receiverName,
a.receiver_phone receiverPhone, a.receiver_phone receiverPhone,
a.receiver_province receiverProvince, a.receiver_province receiverProvince,
a.coupon_amount couponAmount,
a.receiver_city receiverCity, a.receiver_city receiverCity,
a.receiver_district receiverDistrict, a.receiver_district receiverDistrict,
a.receiver_detail_address receiverDetailAddress, a.receiver_detail_address receiverDetailAddress,
@ -168,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
aftersale_status, aftersale_status,
note, note,
delivery_sn, delivery_sn,
coupon_amount,
create_time, create_time,
payment_time, payment_time,
receiver_name, receiver_name,
@ -200,6 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
member_id, member_id,
total_amount, total_amount,
pay_amount, pay_amount,
coupon_amount,
status, status,
aftersale_status, aftersale_status,
note, note,

@ -41,3 +41,8 @@ CREATE TABLE `act_member_coupon`
`create_time` datetime(3) DEFAULT NULL COMMENT '创建时间', `create_time` datetime(3) DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户领券记录'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户领券记录';
ALTER TABLE `oms_order`
ADD COLUMN `member_coupon_id` bigint(20) NULL COMMENT '使用的优惠券id' AFTER `receiver_phone_encrypted`,
ADD COLUMN `coupon_amount` decimal(10, 2) NULL COMMENT '优惠券金额' AFTER `member_coupon_id`;
Loading…
Cancel
Save