修复退款相关BUG

joying-common/src/main/java/com/fzm/common/service/impl/CopyrightApplyServiceImpl.java

@@ -53,7 +53,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Slf4j
 @Service
-@Transactional(rollbackFor = RuntimeException.class)
+@Transactional(rollbackFor = Exception.class)
 public class CopyrightApplyServiceImpl extends ServiceImpl<CopyrightApplyMapper, CopyrightApply> implements CopyrightApplyService {
     @Resource
     private CopyrightApplyMapper copyrightApplyMapper;

joying-common/src/main/java/com/fzm/common/service/impl/OrderServiceImpl.java

@@ -66,7 +66,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
-    @Transactional(rollbackFor = RuntimeException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Order createOrder(OrderDto orderDto) {
         Charge charge = chargeService.getByType(orderDto.getPayScene());
         if (!orderDto.getFee().equals(charge.getFee())) {
@@ -121,7 +121,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
-    @Transactional(rollbackFor = RuntimeException.class)
+    @Transactional(rollbackFor = Exception.class)
     public Boolean cancel(Long orderId, OrderStatus orderStatus) {
         Order order = this.getById(orderId);
         Integer productId = order.getProductId();

joying-common/src/main/java/com/fzm/common/service/impl/PaymentServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @date 2022/1/20 16:40
  */
 @Service
-@Transactional(rollbackFor = RuntimeException.class)
+@Transactional(rollbackFor = Exception.class)
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class PaymentServiceImpl extends ServiceImpl<PaymentMapper, Payment> implements PaymentService {
     private final PaymentMapper paymentMapper;

joying-common/src/main/java/com/fzm/common/service/impl/RefundServiceImpl.java

@@ -26,7 +26,7 @@ import java.util.List;
  * @date 2022/1/24 14:27
  */
 @Service
-@Transactional(rollbackFor = RuntimeException.class)
+@Transactional(rollbackFor = Exception.class)
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class RefundServiceImpl extends ServiceImpl<RefundMapper, Refund> implements RefundService {
 

joying-common/src/main/java/com/fzm/common/service/impl/UserServiceImpl.java

@@ -60,7 +60,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-@Transactional(rollbackFor = RuntimeException.class)
+@Transactional(rollbackFor = Exception.class)
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements UserService {
     private final UserMapper userMapper;

joying-common/src/main/java/com/fzm/common/service/impl/WxPayServiceImpl.java

@@ -358,6 +358,7 @@ public class WxPayServiceImpl implements WxPayService {
                 refund.setRefundStatus(RefundStatus.SUCCESS.getStatus());
                 refund.setSuccessTime(obj.getStr("success_time"));
                 refund.setContent(JSONUtil.toJsonStr(obj));
+                refund.setFailMessage("");
                 refundService.updateById(refund);
                 // 更新流水的退款状态
                 Payment payment = paymentService.getByOrderId(out_trade_no);