Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreAfterSalesServiceImpl.java

@@ -606,7 +606,7 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService
                                 paymentMap.setPaymentId(payment.getPaymentId());
                                 paymentMap.setStatus(-1);
                                 paymentMap.setRefundTime(DateUtils.getNowDate());
-                                paymentMap.setRefundMoney(payment.getPayMoney());
+                                paymentMap.setRefundMoney(refundAmount);
                                 paymentService.updateFsStorePayment(paymentMap);
                             }
                             else {
@@ -626,7 +626,7 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService
                         HuiFuRefundResult refund = huiFuService.refund(request);
                         logger.info("退款："+refund);
                         if((refund.getResp_code().equals("00000000")||refund.getResp_code().equals("00000100"))&&(refund.getTrans_stat().equals("S")||refund.getTrans_stat().equals("P"))){
-                            payment.setRefundMoney(payment.getPayMoney());
+                            payment.setRefundMoney(refundAmount);
                             payment.setStatus(-1);
                             payment.setRefundTime(new Date());
                             paymentService.updateFsStorePayment(payment);