diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index ef3f3041..50dc50e5 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -192,7 +192,7 @@ public class OrderController extends BaseController { OrderMaster orderMaster = new OrderMaster(); orderMaster.setDeptId(deptId); orderMaster.setCode(orderMasterService.createOrderCode()); - orderMaster.setOrderType(1); + orderMaster.setOrderType(0); orderMaster.setPayType(appOrderRequest.getPayType()); orderMaster.setOrderStatus(OrderStatus.PLAIN.code()); orderMaster.setCustomerId(appOrderRequest.getCustomerId()); diff --git a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialMasterMapper.java b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialMasterMapper.java index 5e3bf83c..9d8d4e5a 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialMasterMapper.java +++ b/ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialMasterMapper.java @@ -1,6 +1,7 @@ package com.ghy.payment.mapper; import com.ghy.payment.domain.FinancialMaster; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -49,7 +50,16 @@ public interface FinancialMasterMapper { * @param orderNo 订单号 * @param payType 支付渠道 */ - void paySucceeded(String orderNo, int payType); + void paySucceeded(@Param(value = "orderNo") String orderNo, @Param(value = "payType") int payType); + + /** + * 支付成功 + * + * @param orderNo 订单号 + * @param payStatus 支付渠道 + */ + void updateOrderStatus(@Param(value = "orderNo") String orderNo, @Param(value = "payStatus") int payStatus); + /** * 用主订单ID查询主财务单 diff --git a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java index fe5b7ea0..57deaee3 100644 --- a/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java +++ b/ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java @@ -2,6 +2,7 @@ package com.ghy.payment.service.impl; import com.ghy.common.adapay.model.PaymentDTO; import com.ghy.common.core.text.Convert; +import com.ghy.common.enums.PayStatus; import com.ghy.common.enums.PayTypeEnum; import com.ghy.payment.domain.FinancialMaster; import com.ghy.payment.mapper.FinancialMasterMapper; @@ -76,6 +77,7 @@ public class FinancialMasterServiceImpl implements FinancialMasterService { public void paySucceeded(String orderNo, String payChannel) { try { financialMasterMapper.paySucceeded(orderNo, PayTypeEnum.valueOf(payChannel.toUpperCase()).getCode()); + financialMasterMapper.updateOrderStatus(orderNo, PayStatus.PAID.getCode()); } catch (IllegalArgumentException e) { logger.warn("OrderNo[{}] Unknown payChannel [{}]!", orderNo, payChannel); } diff --git a/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml b/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml index c92f7004..70fe0eb3 100644 --- a/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml +++ b/ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml @@ -97,13 +97,18 @@ UPDATE financial_master SET - pay_status = #{payStatus}, + pay_status = 1 , pay_type = #{payType}, pay_time = SYSDATE(), update_time = SYSDATE() WHERE order_master_code = #{orderNo} + + UPDATE order_master SET pay_status = #{payStatus} , pay_time = SYSDATE(), update_time = SYSDATE() + WHERE code = #{orderNo} + + INSERT INTO financial_master( dept_id,