diff --git a/src/main/java/com/sczx/pay/controller/AliPaymentController.java b/src/main/java/com/sczx/pay/controller/AliPaymentController.java index 7d566b8..8c3f713 100644 --- a/src/main/java/com/sczx/pay/controller/AliPaymentController.java +++ b/src/main/java/com/sczx/pay/controller/AliPaymentController.java @@ -29,8 +29,8 @@ public class AliPaymentController { @ApiOperation(value = "支付宝芝麻统一下单接口") @PostMapping("/zhiMaOrder") - public AlipayCreateResponse aliPayZhiMaOrder(@RequestBody AlipayCreateRequest request) { - log.info("收到支付宝支付请求: {}", request); + public AlipayCreateResponse zhiMaOrder(@RequestBody AlipayCreateRequest request) { + log.info("收到支付宝免押支付请求: {}", request); return alipayService.zhiMaOrder(request); } diff --git a/src/main/java/com/sczx/pay/mapper/OrderPayMapper.java b/src/main/java/com/sczx/pay/mapper/OrderPayMapper.java index 23c213b..987fe10 100644 --- a/src/main/java/com/sczx/pay/mapper/OrderPayMapper.java +++ b/src/main/java/com/sczx/pay/mapper/OrderPayMapper.java @@ -74,10 +74,9 @@ public interface OrderPayMapper { /** * 免押成功,更新子订单状态 */ - @Update("update zc_order_sub set transaction_id = #{transactionId},pay_status = 'SUCCESS'" + - " where payment_id = #{authNo}") - int updateFreezeSubOrderPaymentStatus(@Param("authNo") String authNo, - @Param("transactionId") String transactionId); + @Update("update zc_order_sub set transaction_id = #{authNo},pay_status = 'SUCCESS'" + + " where payment_id = #{outTradeNo}") + int updateFreezeSubOrderPaymentStatus(@Param("outTradeNo") String outTradeNo,@Param("authNo") String authNo); @Select("SELECT SHA2 ( CONVERT (concat(u.real_name,u.id_no) USING utf8 ), 256 ) as hashStr FROM zc_order_sub s,zc_order_main m,zc_base_user u WHERE s.payment_id = #{paymentId} AND s.order_id = m.order_id AND m.customer_phone = u.phone_number AND u.authed = '1'") String getHashStrByTradeNo(@Param("paymentId") String paymentId);