clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

回调修改订单、财务单状态

This commit is contained in:
kuang.yifei@iwhalecloud.com 2022-06-08 14:50:41 +08:00
parent b0476d6bed
commit 940ac02bce
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
View File

@ -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());

12
ghy-payment/src/main/java/com/ghy/payment/mapper/FinancialMasterMapper.java
View File

@ -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查询主财务单

2
ghy-payment/src/main/java/com/ghy/payment/service/impl/FinancialMasterServiceImpl.java
View File

@ -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);
}

7
ghy-payment/src/main/resources/mapper/financial/FinancialMasterMapper.xml
View File

@ -97,13 +97,18 @@
<update id="paySucceeded">
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>
<update id="updateOrderStatus">
UPDATE order_master SET pay_status = #{payStatus} , pay_time = SYSDATE(), update_time = SYSDATE()
WHERE code = #{orderNo}
</update>
<insert id="insertFinancialMaster" parameterType="com.ghy.payment.domain.FinancialMaster" useGeneratedKeys="true" keyProperty="id">
INSERT INTO financial_master(
<if test="deptId != null">dept_id,</if>