chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

临时提交

Browse Source
This commit is contained in:
墨大叔 2024-07-30 13:55:03 +08:00
parent fca590fbd3
commit 6708e537f1
3 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
smart-switch-service/src/main/java/com/ruoyi/ss/refund/domain/RefundQuery.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.ss.refund.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@ -8,4 +9,8 @@ import lombok.Data;
*/
@Data
public class RefundQuery extends Refund {
@ApiModelProperty("订单收款人ID")
private Long billMchId;
}

10
smart-switch-service/src/main/java/com/ruoyi/ss/refund/mapper/RefundMapper.xml
View File

@ -21,7 +21,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sr.user_id,
sr.user_name,
smb.money as bill_amount,
smb.bill_no as bill_no
smb.bill_no as bill_no,
smb.mch_id as bill_mch_id
from ss_refund sr
left join sm_transaction_bill smb on smb.bill_id = sr.bill_id
</sql>
@ -31,9 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.refundNo != null and query.refundNo != ''"> and sr.refund_no = #{query.refundNo}</if>
<if test="query.billId != null "> and sr.bill_id = #{query.billId}</if>
<if test="query.status != null and query.status != ''"> and sr.status = #{query.status}</if>
<if test="query.userType != null and query.userType != ''"> and user_type = #{query.userType}</if>
<if test="query.userId != null "> and user_id = #{query.userId}</if>
<if test="query.userName != null and query.userName != ''"> and user_name like concat('%', #{query.userName}, '%')</if>
<if test="query.userType != null and query.userType != ''"> and sr.user_type = #{query.userType}</if>
<if test="query.userId != null "> and sr.user_id = #{query.userId}</if>
<if test="query.userName != null and query.userName != ''"> and sr.user_name like concat('%', #{query.userName}, '%')</if>
<if test="query.billMchId != null "> and smb.user_id = #{query.billMchId}</if>
</sql>
<select id="selectRefundList" parameterType="Refund" resultMap="RefundResult">

37
smart-switch-web/src/main/java/com/ruoyi/web/controller/mch/MchRefundController.java Normal file
View File

@ -0,0 +1,37 @@
package com.ruoyi.web.controller.mch;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.ss.refund.domain.RefundQuery;
import com.ruoyi.ss.refund.domain.RefundVO;
import com.ruoyi.ss.refund.service.RefundService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author wjh
* 2024/7/30
*/
@RestController
@RequestMapping("/mch/refund")
public class MchRefundController extends BaseController {
@Autowired
private RefundService refundService;
@ApiOperation("订单收款人查询退款列表")
@GetMapping("/list")
public TableDataInfo list(RefundQuery query)
{
startPage();
query.setBillMchId(getUserId());
List<RefundVO> list = refundService.selectRefundList(query);
return getDataTable(list);
}
}