Merge remote-tracking branch 'origin/test' into dkxd2

src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

@@ -606,7 +606,7 @@ public class PayService {
         flow.setBizCode("accountPay");
         flow.setBizName("会员储值卡支付");
         flow.setType("-");
-        flow.setAmount(orderInfo.getOrderAmount());
+        flow.setAmount(payAmount);
         flow.setBalance(user.getAmount());
         flow.setCreateTime(new Date());
         tbShopUserFlowMapper.insert(flow);