czg_team/cashier-client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

配置测试环境支付成功回调

Browse Source
This commit is contained in:
谭凯凯
2024-10-10 16:46:34 +08:00
committed by Tankaikai
parent c9da828246
commit ba710c854e
4 changed files with 87 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
View File

@@ -1,5 +1,6 @@
package com.chaozhanggui.system.cashierservice.service;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -18,7 +19,10 @@ import com.chaozhanggui.system.cashierservice.entity.dto.ChoseCountDTO;
import com.chaozhanggui.system.cashierservice.entity.dto.ReturnCartDTO;
import com.chaozhanggui.system.cashierservice.entity.dto.ShopEatTypeInfoDTO;
import com.chaozhanggui.system.cashierservice.entity.dto.UpdateVipDTO;
import com.chaozhanggui.system.cashierservice.entity.po.*;
import com.chaozhanggui.system.cashierservice.entity.po.CartPo;
import com.chaozhanggui.system.cashierservice.entity.po.OrderPo;
import com.chaozhanggui.system.cashierservice.entity.po.QueryCartPo;
import com.chaozhanggui.system.cashierservice.entity.po.SkuInfoPo;
import com.chaozhanggui.system.cashierservice.entity.vo.CartVo;
import com.chaozhanggui.system.cashierservice.exception.MsgException;
import com.chaozhanggui.system.cashierservice.exception.NotPrintException;
@@ -39,6 +43,7 @@ import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.CompletableFuture;
@@ -117,6 +122,9 @@ public class OrderService {
@Autowired
private RabbitMsgUtils rabbitMsgUtils;
@Resource
private TbOrderPaymentMapper tbOrderPaymentMapper;
public OrderService(WxAccountUtil wxAccountUtil, MPCashierCartMapper mpCashierCartMapper,
TbShopOpenIdMapper shopOpenIdMapper, MpShopTableMapper mpShopTableMapper,
@@ -401,7 +409,7 @@ public class OrderService {
if (shopEatTypeInfoDTO.isTakeout()) {
query.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.eq(TbCashierCart::getMasterId, MasterId);
}else {
} else {
query.eq(TbCashierCart::getTableId, tableId).and(query2 -> query2.and(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
.eq(TbCashierCart::getMasterId, MasterId))
.or(query4 -> query4.isNull(TbCashierCart::getTradeDay)
@@ -464,7 +472,7 @@ public class OrderService {
List<TbShopOpenId> shopOpenIds = shopOpenIdMapper.selectStateByShopIdAndType(product.getShopId(), ShopWxMsgTypeEnum.STOCK_MSG.getType());
shopOpenIds.forEach(item -> {
wxAccountUtil.sendStockWarnMsg("商品库存不足", product.getName(),
product.getStockNumber() - num , item.getOpenId(), ShopWxMsgTypeEnum.STOCK_MSG, shopId);
product.getStockNumber() - num, item.getOpenId(), ShopWxMsgTypeEnum.STOCK_MSG, shopId);
});
}
}
@@ -852,7 +860,6 @@ public class OrderService {
orderDetails.add(orderDetail);
// 库存预警校验
if (TableConstant.CART_SEAT_ID.equals(cashierCart.getProductId())) {
CompletableFuture.runAsync(() -> checkWarnLineAndSendMsg(tbProduct, product, Integer.valueOf(cashierCart.getShopId()), cashierCart.getNumber()));
@@ -1112,7 +1119,7 @@ public class OrderService {
mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
.eq(TbCashierCart::getOrderId, tbOrderInfo.getId())
.eq(TbCashierCart::getShopId, shopId)
.eq(TbCashierCart::getStatus, "create")
.eq(TbCashierCart::getStatus, "create")
.set(TbCashierCart::getStatus, "refund"));
mpOrderDetailService.update(null, new LambdaUpdateWrapper<TbOrderDetail>()
@@ -1857,4 +1864,36 @@ public class OrderService {
.eq(TbOrderInfo::getStatus, "paying")
.set(TbOrderInfo::getStatus, "unpaid"));
}
public TbOrderInfo selectByPayOrderNo(String payOrderNo) {
return mPOrderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getPayOrderNo, payOrderNo));
}
@Transactional(rollbackFor = Exception.class)
public void payCallbackCloseOrder(TbOrderInfo entity, String payType) {
mPOrderInfoMapper.update(null, new LambdaUpdateWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getId, entity.getId())
.eq(TbOrderInfo::getStatus, "paying")
.set(TbOrderInfo::getStatus, "closed")
.set(TbOrderInfo::getPaidTime, entity.getPaidTime())
.set(TbOrderInfo::getUpdatedAt, System.currentTimeMillis())
);
List<TbOrderPayment> list = tbOrderPaymentMapper.selectListByOrderId(Convert.toStr(entity.getId()));
for (TbOrderPayment payment : list) {
payment.setTradeNumber(entity.getPayOrderNo());
payment.setUpdatedAt(System.currentTimeMillis());
if ("WECHAT".equals(payType)) {
payment.setPayName("微信支付");
payment.setPayType("wechatPay");
} else if ("ALIPAY".equals(payType)) {
payment.setPayName("支付宝支付");
payment.setPayType("aliPay");
} else {
payment.setPayName(payType);
payment.setPayType(payType);
}
tbOrderPaymentMapper.updateByPrimaryKey(payment);
}
}
}