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