liujunchi 2 лет назад
Родитель
Сommit
e1298b7c84

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

@@ -610,15 +610,18 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             userOrderPayment.setStatus(TradeStatusEnum.succeeded);
             userOrderPayment.setUpdateTime(new Date());
             userOrderPayment.setArrivalTime(new Date());
-            userOrderPayment.setBackPayAmt(
-                    new BigDecimal(queryPaymentData.getPayAmt()));
+            if (queryPaymentData.getPayAmt() != null) {
+                userOrderPayment.setBackPayAmt(new BigDecimal(queryPaymentData.getPayAmt()));
+            }
 
             ExecutePaymentCallBack executePaymentCallBack = queryPaymentData.getExecutePaymentCallBack();
             if (null != executePaymentCallBack) {
                 userOrderPayment.setArrivalTime(executePaymentCallBack.getTradeTime());
-                userOrderPayment.setBackPayAmt(
-                        new BigDecimal(executePaymentCallBack.getPayAmt()));
-                userOrderPayment.setFeeAmt(new BigDecimal(executePaymentCallBack.getFeeAmt()));
+
+                if (executePaymentCallBack.getPayAmt() != null) {
+                    userOrderPayment.setBackPayAmt(new BigDecimal(executePaymentCallBack.getPayAmt()));
+                    userOrderPayment.setFeeAmt(new BigDecimal(executePaymentCallBack.getFeeAmt()));
+                }
             }
             orderPaymentService.updateById(userOrderPayment);
             return false;