liujunchi преди 2 години
родител
ревизия
7b038addff
променени са 1 файла, в които са добавени 6 реда и са изтрити 3 реда
  1. 6 3
      cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

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

@@ -545,9 +545,12 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
                 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);
             } else {