[收银台][修改]:收银台支持券

mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

@@ -458,7 +458,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
                 record.setPayTimeEnd(currentDate);
                 // 支付单号
                 record.setPayOrderNo(payOrderNo);
-                record.setPayAmount(order.getPayment());
+                record.setPayAmount(record.getPayAmount());
                 record.setPayVendor(EnumPayWay.PAY_WAY_WEAPP.getCode());
                 record.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode());
                 record.setShare(isShare.getCode());
@@ -498,7 +498,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
                 wxPayOrderP.setNonce_str(noncestr);
                 wxPayOrderP.setBody(order.getDetail());
                 wxPayOrderP.setOut_trade_no(record.getPayOrderNo());
-                wxPayOrderP.setTotal_fee(order.getPayment());
+                wxPayOrderP.setTotal_fee(record.getPayAmount());
                 wxPayOrderP.setSpbill_create_ip(record.getIp());               // 终端IP
                 wxPayOrderP.setAuth_code(record.getAuthCode());
                 wxPayOrderP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate));
@@ -563,7 +563,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
                 wxPayOrderSP.setNonce_str(noncestr);
                 wxPayOrderSP.setBody(order.getDetail());
                 wxPayOrderSP.setOut_trade_no(record.getPayOrderNo());
-                wxPayOrderSP.setTotal_fee(order.getPayment());
+                wxPayOrderSP.setTotal_fee(record.getPayAmount());
                 wxPayOrderSP.setSpbill_create_ip(record.getIp());
                 wxPayOrderSP.setAuth_code(record.getAuthCode());
                 wxPayOrderSP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate));