Skip to content

A
api
Commit e77ed490 by 不悦
Options

ycf0729

parent 913a6600
Showing with 126 additions and 30 deletions
yami-shop-admin/src/main/java/com/yami/shop/admin/controller/BargainController.java
......@@ -92,7 +92,7 @@ public class BargainController {
.like(bargain.getProdName() != null, Bargain::getProdName, bargain.getProdName()));
for(Bargain BG:bargainList){
Product product = productService.getProductByProdId(BG.getProdId());
BG.setCostPrice(product.getPrice());
BG.setProduct(product);
}
return ResponseEntity.ok(bargainList);
}
......
yami-shop-api/src/main/java/com/yami/shop/api/controller/BargainController.java
......@@ -59,6 +59,7 @@ public class BargainController {
IPage<Bargain> bargains = bargainService.page(page,
new LambdaQueryWrapper<Bargain>()
.eq(Bargain::getStatus,1)
.gt(Bargain::getStocks,0)
.orderByDesc(Bargain::getCreatedAt));
if(bargains.getRecords().size()>0){
for(Bargain bargain:bargains.getRecords()){
......@@ -116,6 +117,7 @@ public class BargainController {
BargainSend BS=bargainSendService.selectBargainTask(userId,bargainSend.getActivityId());
if(ObjectUtil.isNull(BS)){
Bargain bargain = bargainService.getBargainById(bargainSend.getActivityId());//取能砍的最低价格
isFirstTime = 1;
bargainSend.setCreatedAt(new Date());
bargainSend.setIsAddorder(0);//未下单
......@@ -149,6 +151,9 @@ public class BargainController {
ProductDto product = prodController.prodInfoBargain(bargainSend.getProdId());
BS.setProductDto(product);
Bargain bargain = bargainService.getBargainById(bargainSend.getActivityId());
if(product.getTotalStocks()<bargain.getStocks()){
bargain.setStocks(product.getTotalStocks());
}
BS.setBargain(bargain);
List<BargainHelp> bargainHelpList = bargainHelpService.selectListByBargainOrderId(BS.getId());
double cutMoney = 0;
......
yami-shop-api/src/main/java/com/yami/shop/api/controller/OrderController.java
......@@ -17,8 +17,7 @@ import javax.validation.Valid;
import cn.hutool.core.util.ObjectUtil;
import com.yami.shop.bean.app.dto.*;
import com.yami.shop.bean.event.ConfirmOrderEvent;
import com.yami.shop.bean.model.BargainHelp;
import com.yami.shop.bean.model.BargainSend;
import com.yami.shop.bean.model.*;
import com.yami.shop.common.exception.YamiShopBindException;
import com.yami.shop.security.util.SecurityUtils;
import com.yami.shop.service.*;
......@@ -33,8 +32,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.yami.shop.bean.app.param.OrderParam;
import com.yami.shop.bean.app.param.OrderShopParam;
import com.yami.shop.bean.app.param.SubmitOrderParam;
import com.yami.shop.bean.model.Order;
import com.yami.shop.bean.model.UserAddr;
import com.yami.shop.common.util.Arith;
import cn.hutool.core.collection.CollectionUtil;
......@@ -67,6 +64,8 @@ public class OrderController {
private BargainHelpService bargainHelpService;
@Autowired
private ProdController prodController;
@Autowired
private BargainService bargainService;
/**
* 生成订单
*/
......@@ -83,7 +82,7 @@ public class OrderController {
isBargain=orderParam.getOrderItem().getIsBargain();
}
// 组装获取用户提交的购物车商品项
List<ShopCartItemDto> shopCartItems = basketService.getShopCartItemsByOrderItems(isBargain,orderParam.getBasketIds(),orderParam.getOrderItem(),userId);
List<ShopCartItemDto> shopCartItems = basketService.getShopCartItemsByOrderItems(orderParam,isBargain,orderParam.getBasketIds(),orderParam.getOrderItem(),userId);
if (CollectionUtil.isEmpty(shopCartItems)) {
throw new YamiShopBindException("请选择您需要的商品加入购物车");
......@@ -148,8 +147,10 @@ public class OrderController {
actualTotal=product.getPrice()-cutMoney;
total = actualTotal;
}
shopCartOrderMergerDto.setActualTotal(actualTotal);
shopCartOrderMergerDto.setTotal(total);
// shopCartOrderMergerDto.setActualTotal(actualTotal);
// shopCartOrderMergerDto.setTotal(total);
shopCartOrderMergerDto.setActualTotal(0.01);
shopCartOrderMergerDto.setTotal(0.01);
shopCartOrderMergerDto.setTotalCount(totalCount);
shopCartOrderMergerDto.setShopCartOrders(shopCartOrders);
shopCartOrderMergerDto.setOrderReduce(orderReduce);
......@@ -184,10 +185,11 @@ public class OrderController {
}
}
}
List<Order> orders = orderService.submit(userId,mergerOrder);
String isBargain ="";
if("1".equals(submitOrderParam.getIsBargain())){
isBargain=submitOrderParam.getIsBargain();
}
List<Order> orders = orderService.submit(userId,mergerOrder,isBargain,submitOrderParam);
StringBuilder orderNumbers = new StringBuilder();
for (Order order : orders) {
......
yami-shop-api/src/main/java/com/yami/shop/api/controller/PayNoticeController.java
......@@ -38,7 +38,6 @@ public class PayNoticeController {
@RequestMapping("/order")
public ResponseEntity<Void> submit(@RequestBody String xmlData) throws WxPayException {
WxPayOrderNotifyResult parseOrderNotifyResult = wxMiniPayService.parseOrderNotifyResult(xmlData);
String payNo = parseOrderNotifyResult.getOutTradeNo();
String bizPayNo = parseOrderNotifyResult.getTransactionId();
......
yami-shop-api/src/main/java/com/yami/shop/api/listener/SubmitOrderListener.java
......@@ -11,6 +11,7 @@
package com.yami.shop.api.listener;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.yami.shop.bean.app.dto.ShopCartItemDiscountDto;
import com.yami.shop.bean.app.dto.ShopCartItemDto;
......@@ -67,6 +68,8 @@ public class SubmitOrderListener {
private final BasketMapper basketMapper;
private final BargainMapper bargainMapper;
/**
* 计算订单金额
*/
......@@ -144,6 +147,15 @@ public class SubmitOrderListener {
if (shopCartItem.getBasketId() != null && shopCartItem.getBasketId() != 0) {
basketIds.add(shopCartItem.getBasketId());
}
if(ObjectUtil.isNotNull(shopCartItem.getBasketId())){
Bargain bargain = bargainMapper.getBargain(shopCartItem.getBargainId());
if(bargain.getStocks()==0){
throw new YamiShopBindException("商品库存不足");
}
}
}
}
......
yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ShopCartItemDto.java
......@@ -49,4 +49,6 @@ public class ShopCartItemDto extends ProductItemDto implements Serializable {
@ApiModelProperty(value = "加入购物车的时间")
private Date basketDate;
@ApiModelProperty(value = "砍价活动id")
private Long bargainId;
}
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/OrderParam.java
......@@ -41,6 +41,7 @@ public class OrderParam {
@ApiModelProperty(value = "优惠券id数组")
private List<Long> couponIds;
private Long bargainId;
// @ApiModelProperty(value = "每次订单提交时的uuid")
// private String uuid;
......
yami-shop-bean/src/main/java/com/yami/shop/bean/app/param/SubmitOrderParam.java
......@@ -21,4 +21,12 @@ import lombok.Data;
public class SubmitOrderParam {
@ApiModelProperty(value = "每个店铺提交的订单信息",required=true)
private List<OrderShopParam> orderShopParam;
@ApiModelProperty(value = "1、砍价页面，0,、其他页面")
private String isBargain;
@ApiModelProperty(value = "砍价活动id")
private Long bargainId;
private Long prodId;
}
yami-shop-bean/src/main/java/com/yami/shop/bean/model/Bargain.java
......@@ -139,8 +139,8 @@ public class Bargain implements Serializable {
@TableField(exist = false)
private Integer SendCount;
@ApiModelProperty(value = "商品现价", required = false)
@ApiModelProperty(value = "后台商品信息", required = false)
@TableField(exist = false)
private Double costPrice;
private Product product;
}
yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java
......@@ -189,4 +189,14 @@ public class Order implements Serializable {
*/
@TableField(exist = false)
private UserAddrOrder userAddrOrder;
/**
* 是否砍价模块进来:1是，0否
*/
private String isBargain;
/**
* 砍价活动id
*/
private Long bargainId;
}
yami-shop-service/src/main/java/com/yami/shop/dao/BargainMapper.java
......@@ -24,4 +24,8 @@ public interface BargainMapper extends BaseMapper<Bargain> {
Bargain getBargainById(@Param("id")Long id);
int updateStocks(@Param("id")Long id);
Bargain getBargain(@Param("id")Long id);
}
yami-shop-service/src/main/java/com/yami/shop/dao/BargainSendMapper.java
......@@ -15,4 +15,6 @@ public interface BargainSendMapper extends BaseMapper<BargainSend> {
BargainSend selectBargainTask(@Param("userId") String userId,@Param("activityId") Long activityId);
int updateCount(@Param("id") Long id);
int updateStatus(@Param("userId") String userId,@Param("activityId") Long activityId);
}
yami-shop-service/src/main/java/com/yami/shop/service/BargainService.java
......@@ -45,4 +45,7 @@ public interface BargainService extends IService<Bargain> {
List<BargainDetailParm> selectBargainDetail(Long id);
int selectBargainNum(Long id);
Bargain getBargain(Long id);
void updateStocks(Long id);
}
yami-shop-service/src/main/java/com/yami/shop/service/BasketService.java
......@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yami.shop.bean.app.dto.*;
import com.yami.shop.bean.app.param.ChangeShopCartParam;
import com.yami.shop.bean.app.param.OrderItemParam;
import com.yami.shop.bean.app.param.OrderParam;
import com.yami.shop.bean.app.param.ShopCartParam;
import com.yami.shop.bean.model.Basket;
......@@ -63,6 +64,6 @@ public interface BasketService extends IService<Basket> {
* @param userId 当前用户的用户id
* @return 所有的商品购物项
*/
List<ShopCartItemDto> getShopCartItemsByOrderItems(String isBargain,List<Long> basketId, OrderItemParam orderItem,String userId);
List<ShopCartItemDto> getShopCartItemsByOrderItems(OrderParam orderParam,String isBargain, List<Long> basketId, OrderItemParam orderItem, String userId);
}
yami-shop-service/src/main/java/com/yami/shop/service/OrderService.java
......@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yami.shop.bean.app.dto.OrderCountData;
import com.yami.shop.bean.app.dto.ShopCartOrderMergerDto;
import com.yami.shop.bean.app.param.SubmitOrderParam;
import com.yami.shop.bean.model.Order;
import com.yami.shop.bean.param.OrderParam;
......@@ -37,7 +38,7 @@ public interface OrderService extends IService<Order> {
void removeConfirmOrderCache(String userId);
List<Order> submit(String userId, ShopCartOrderMergerDto mergerOrder);
List<Order> submit(String userId, ShopCartOrderMergerDto mergerOrder, String isBargain, SubmitOrderParam submitOrderParam);
void delivery(Order order);
......
yami-shop-service/src/main/java/com/yami/shop/service/impl/BargainServiceImpl.java
......@@ -50,4 +50,15 @@ public class BargainServiceImpl extends ServiceImpl<BargainMapper, Bargain> impl
public int selectBargainNum(Long id){
return bargainMapper.selectBargainNum(id);
}
@Override
public Bargain getBargain(Long id) {
Bargain bargain = bargainMapper.getBargain(id);
return bargain;
}
@Override
public void updateStocks(Long id) {
bargainMapper.updateStocks(id);
}
}
yami-shop-service/src/main/java/com/yami/shop/service/impl/BasketServiceImpl.java
......@@ -18,6 +18,7 @@ import com.google.common.collect.Lists;
import com.yami.shop.bean.app.dto.*;
import com.yami.shop.bean.app.param.ChangeShopCartParam;
import com.yami.shop.bean.app.param.OrderItemParam;
import com.yami.shop.bean.app.param.OrderParam;
import com.yami.shop.bean.app.param.ShopCartParam;
import com.yami.shop.bean.event.ShopCartEvent;
import com.yami.shop.bean.model.Basket;
......@@ -161,7 +162,7 @@ public class BasketServiceImpl extends ServiceImpl<BasketMapper, Basket> impleme
}
@Override
public List<ShopCartItemDto> getShopCartItemsByOrderItems(String isBargain,List<Long> basketId, OrderItemParam orderItem,String userId) {
public List<ShopCartItemDto> getShopCartItemsByOrderItems(OrderParam orderParam,String isBargain, List<Long> basketId, OrderItemParam orderItem, String userId) {
if (orderItem == null && CollectionUtil.isEmpty(basketId)) {
return Collections.emptyList();
}
......@@ -191,6 +192,7 @@ public class BasketServiceImpl extends ServiceImpl<BasketMapper, Basket> impleme
shopCartItemDto.setPrice(sku.getPrice());
if("1".equals(isBargain)){
shopCartItemDto.setPrice(prod.getPrice());
shopCartItemDto.setBargainId(orderParam.getBargainId());
}
shopCartItemDto.setDistributionCardNo(orderItem.getDistributionCardNo());
shopCartItemDto.setBasketDate(new Date());
......
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java
......@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yami.shop.bean.app.dto.OrderCountData;
import com.yami.shop.bean.app.dto.ShopCartOrderMergerDto;
import com.yami.shop.bean.app.param.SubmitOrderParam;
import com.yami.shop.bean.event.CancelOrderEvent;
import com.yami.shop.bean.event.ReceiptOrderEvent;
import com.yami.shop.bean.event.SubmitOrderEvent;
......@@ -88,11 +89,22 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
@Override
@Transactional(rollbackFor = Exception.class)
public List<Order> submit(String userId, ShopCartOrderMergerDto mergerOrder) {
public List<Order> submit(String userId, ShopCartOrderMergerDto mergerOrder, String isBargain, SubmitOrderParam submitOrderParam) {
List<Order> orderList = new ArrayList<>();
if("1".equals(isBargain)){
// mergerOrder.getShopCartOrders().get(0).setActualTotal(mergerOrder.getActualTotal());
// mergerOrder.getShopCartOrders().get(0).setTotal(mergerOrder.getTotal());
mergerOrder.getShopCartOrders().get(0).setActualTotal(0.01);
mergerOrder.getShopCartOrders().get(0).setTotal(0.01);
}
// 通过事务提交订单
eventPublisher.publishEvent(new SubmitOrderEvent(mergerOrder, orderList));
if("1".equals(isBargain)){
for(Order o: orderList){
o.setIsBargain(isBargain);
o.setBargainId(submitOrderParam.getBargainId());
}
}
// 插入订单
orderList.forEach(order -> orderMapper.insert(order));
List<OrderItem> orderItems = orderList.stream().flatMap(order -> order.getOrderItems().stream()).collect(Collectors.toList());
......
yami-shop-service/src/main/java/com/yami/shop/service/impl/PayServiceImpl.java
......@@ -12,17 +12,11 @@ import com.chuanglan.demo.SmsSendDemo;
import com.yami.shop.bean.app.param.PayParam;
import com.yami.shop.bean.enums.PayType;
import com.yami.shop.bean.event.PaySuccessOrderEvent;
import com.yami.shop.bean.model.Order;
import com.yami.shop.bean.model.OrderItem;
import com.yami.shop.bean.model.OrderSettlement;
import com.yami.shop.bean.model.Product;
import com.yami.shop.bean.model.UserAddrOrder;
import com.yami.shop.bean.model.*;
import com.yami.shop.bean.pay.PayInfoDto;
import com.yami.shop.common.exception.YamiShopBindException;
import com.yami.shop.common.util.Arith;
import com.yami.shop.dao.OrderMapper;
import com.yami.shop.dao.OrderSettlementMapper;
import com.yami.shop.dao.UserAddrMapper;
import com.yami.shop.dao.*;
import com.yami.shop.service.OrderItemService;
import com.yami.shop.service.PayService;
import com.yami.shop.service.ProductService;
......@@ -50,6 +44,10 @@ public class PayServiceImpl implements PayService {
private OrderItemService orderItemService;
@Autowired
private Snowflake snowflake;
@Autowired
private BargainMapper bargainMapper;
@Autowired
private BargainSendMapper bargainSendMapper;
public PayServiceImpl() {
}
......@@ -109,6 +107,13 @@ public class PayServiceImpl implements PayService {
return this.orderMapper.getOrderByOrderNumber(orderNumber);
}).collect(Collectors.toList());
orders.forEach((order) -> {
if(order.getIsBargain().equals("1")){
Bargain bargain = bargainMapper.getBargain(order.getBargainId());
bargainSendMapper.updateStatus(order.getUserId(),order.getBargainId());
if(bargain.getStocks()>=1){
bargainMapper.updateStocks(order.getBargainId());
}
}
UserAddrOrder userAddrOrder = this.userAddrMapper.getUserAddrByAddrId(order.getAddrOrderId());
if (userAddrOrder != null) {
String msg = "【旷世之作】尊敬的" + userAddrOrder.getReceiver() + "您好，您购买的" + order.getProdName() + " 已下单成功。" + "小二正在快马加鞭的处理您的订单，祝您购物愉快~~";
......
yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java
......@@ -118,7 +118,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
@Override
@Cacheable(cacheNames = "product", key = "#prodId")
// @Cacheable(cacheNames = "product", key = "#prodId")
public Product getProductByProdId(Long prodId) {
return productMapper.selectById(prodId);
}
......
yami-shop-service/src/main/resources/mapper/BargainMapper.xml
......@@ -240,5 +240,14 @@
where b.id=#{id}
</select>
<select id="getBargain" resultType="com.yami.shop.bean.model.Bargain">
select
*
from tz_bargain
where id=#{id}
order by created_at desc
</select>
<update id="updateStocks" parameterType="com.yami.shop.bean.model.Bargain">
update tz_bargain set stocks = stocks - 1 where id = #{id}
</update>
</mapper>
yami-shop-service/src/main/resources/mapper/BargainSendMapper.xml
......@@ -40,5 +40,10 @@
set bargain_count = bargain_count+1
where id = #{id}
</update>
<update id="updateStatus" parameterType="com.yami.shop.bean.model.BargainSend">
update tz_bargain_send
set is_addorder = 1
where activity_id = #{activityId} and user_id=#{userId}
</update>
</mapper>
yami-shop-service/src/main/resources/mapper/OrderMapper.xml
......@@ -27,6 +27,8 @@
<result column="is_payed" jdbcType="BIT" property="isPayed"/>
<result column="delete_status" jdbcType="INTEGER" property="deleteStatus"/>
<result column="refund_sts" jdbcType="INTEGER" property="refundSts"/>
<result column="is_bargain" jdbcType="VARCHAR" property="isBargain"/>
<result column="bargain_id" jdbcType="BIGINT" property="bargainId"/>
</resultMap>
<resultMap id="MyOrderMap" type="com.yami.shop.bean.app.dto.MyOrderDto">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment