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

src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java

@@ -216,7 +216,7 @@ public class PayController {
                           @RequestParam("orderId") String orderId,
                           @RequestParam("payAmount") BigDecimal payAmount,
                           @RequestParam("discountAmount") BigDecimal discountAmount){
-        return payService.bankPay(orderId,token);
+        return payService.bankPay(orderId,token,payAmount,discountAmount);
     }