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

积分模块相关代码

Browse Source
This commit is contained in:
谭凯凯
2024-11-01 16:51:11 +08:00
committed by Tankaikai
parent 41edba65fc
commit 02a756d32d
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPointsExchangeRecord.java
View File

@@ -106,6 +106,7 @@ public class TbPointsExchangeRecord {
/** /**
* 取消/退款时间 * 取消/退款时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date cancelOrRefundTime; private Date cancelOrRefundTime;
/** /**
* 实际支付时间 * 实际支付时间

8
src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbPointsExchangeRecordServiceImpl.java
View File

@@ -224,7 +224,7 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
} catch (Exception e) { } catch (Exception e) {
throw new MsgException(e.getMessage().concat("，请您取消订单")); throw new MsgException(e.getMessage().concat("，请您取消订单"));
} }
if (!"unpaid".equals(record.getStatus())) { if (!"unpaid".equals(entity.getStatus())) {
throw new MsgException("订单状态异常，请刷新后重试"); throw new MsgException("订单状态异常，请刷新后重试");
} }
if (StrUtil.isBlank(record.getPayType())) { if (StrUtil.isBlank(record.getPayType())) {
@@ -446,12 +446,6 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
if (NumberUtil.equals(entity.getExtraPaymentAmount(), BigDecimal.ZERO)) { if (NumberUtil.equals(entity.getExtraPaymentAmount(), BigDecimal.ZERO)) {
return; return;
} }
if (StrUtil.isBlank(record.getOpenId())) {
throw new MsgException("openId/userId不能为空");
}
if (StrUtil.isBlank(record.getIp())) {
throw new MsgException("无法获取用户ip地址");
}
// 需要额外支付 // 需要额外支付
TbShopInfo shopInfo = mpShopInfoMapper.selectById(entity.getShopId()); TbShopInfo shopInfo = mpShopInfoMapper.selectById(entity.getShopId());
if (shopInfo == null) { if (shopInfo == null) {