积分模块相关代码

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPointsExchangeRecord.java

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

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

@@ -224,7 +224,7 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
         } catch (Exception e) {
             throw new MsgException(e.getMessage().concat("，请您取消订单"));
         }
-        if (!"unpaid".equals(record.getStatus())) {
+        if (!"unpaid".equals(entity.getStatus())) {
             throw new MsgException("订单状态异常，请刷新后重试");
         }
         if (StrUtil.isBlank(record.getPayType())) {
@@ -446,12 +446,6 @@ public class TbPointsExchangeRecordServiceImpl extends ServiceImpl<TbPointsExcha
         if (NumberUtil.equals(entity.getExtraPaymentAmount(), BigDecimal.ZERO)) {
             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());
         if (shopInfo == null) {