事务失效修复

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -503,7 +503,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     }
 
     @Transactional(rollbackFor = Exception.class)
-    void pollingCancelOrder(String orderNo) {
+    public void pollingCancelOrder(String orderNo) {
         closeOrSuccessOrder(orderNo, "订单超时");
     }
 

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/wx/OriginalWxAppTemplate.java

@@ -138,6 +138,9 @@ public class OriginalWxAppTemplate implements PaymentTemplate {
 
             payment.setId(res.getTransactionId());
             String tradeState = res.getTradeState();
+            if (res.getAmount() != null && res.getAmount().getPayerTotal() != null) {
+                payment.setPayAmt(BigDecimal.valueOf(res.getAmount().getTotal()).divide(BigDecimal.valueOf(100)).toString());
+            }
             if ("SUCCESS".equals(tradeState)) {
                 payment.setStatus(TradeStatusEnum.succeeded);
             } else if ("REFUND".equals(tradeState)) {