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 17:35:22 +08:00
parent 147bb2a3fd
commit 4706a4e524
7 changed files with 98 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-switch-service/src/main/java/com/ruoyi/ss/abnormal/mapper/AbnormalMapper.xml
View File

@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sa.name like concat('%', #{keyword}, '%') or
sa.mobile like concat('%', #{keyword}, '%') or
sa.address like concat('%', #{keyword}, '%') or
sa.device_no like concat('%', #{keyword}, '%')
sd.device_no like concat('%', #{keyword}, '%')
)
</if>
</where>

9
smart-switch-service/src/main/java/com/ruoyi/ss/device/service/DeviceService.java
View File

@ -152,7 +152,14 @@ public interface DeviceService
/**
* ids查询列表
*/
List<DeviceVO> selectListByIds(List<Long> ids);
default List<DeviceVO> selectListByIds(List<Long> ids) {
return selectListByIds(ids, null);
}
/**
* ids查询列表
*/
List<DeviceVO> selectListByIds(List<Long> ids, Long userId);
/**
* 查询各店铺的设备数量,并分组

4
smart-switch-service/src/main/java/com/ruoyi/ss/device/service/impl/DeviceServiceImpl.java
View File

@ -765,14 +765,16 @@ public class DeviceServiceImpl implements DeviceService
* ids查询列表
*
* @param ids
* @param userId
*/
@Override
public List<DeviceVO> selectListByIds(List<Long> ids) {
public List<DeviceVO> selectListByIds(List<Long> ids, Long userId) {
if (CollectionUtils.isEmptyElement(ids)) {
return Collections.emptyList();
}
DeviceQuery dto = new DeviceQuery();
dto.setDeviceIds(ids);
dto.setUserId(userId);
return selectSmDeviceList(dto);
}

9
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/TransactionBillQuery.java
View File

@ -90,4 +90,13 @@ public class TransactionBillQuery extends TransactionBill {
@ApiModelProperty("搜索关键词")
private String keyword;
@ApiModelProperty("创建日期范围")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private List<LocalDate> createDateRange;
@ApiModelProperty("支付日期范围")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private List<LocalDate> payDateRange;
}

8
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/mapper/TransactionBillMapper.xml
View File

@ -82,6 +82,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.suitId != null"> and stb.suit_id = #{query.suitId} </if>
<if test="query.storeId != null"> and stb.store_id = #{query.storeId} </if>
<if test="query.endSuitEndTime != null"> and stb.suit_end_time >= #{query.endSuitEndTime}</if>
<if test="query.channelId != null"> and stb.channel_id = #{query.channelId}</if>
<if test="query.withdrawType != null"> and stb.withdraw_type = #{query.withdrawType}</if>
<if test="query.deviceNo != null and query.deviceNo != ''"> and sd.device_no like concat('%', #{query.deviceNo}, '%')</if>
<if test="query.userMobile != null and query.userMobile != ''"> and su.phonenumber like concat('%', #{query.userMobile}, '%')</if>
<if test="query.keyword != null and query.keyword != ''">
@ -130,6 +132,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{item}
</foreach>
</if>
<if test="query.createDateRange != null and query.createDateRange.size() > 1">
and stb.create_time >= #{query.createDateRange[0]} and stb.create_time &lt;= #{query.createDateRange[1]}
</if>
<if test="query.payDateRange != null and query.payDateRange.size() > 1">
and stb.pay_time >= #{query.payDateRange[0]} and stb.pay_time &lt;= #{query.payDateRange[1]}
</if>
</sql>
<select id="selectSmTransactionBillList" parameterType="TransactionBillQuery" resultMap="SmTransactionBillResult">

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

@ -0,0 +1,36 @@
package com.ruoyi.web.controller.mch;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.ss.device.domain.vo.DeviceVO;
import com.ruoyi.ss.device.service.DeviceService;
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.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
import java.util.List;
/**
* @author wjh
* 2024/7/30
*/
@RestController
@RequestMapping("/mch/device")
public class MchDeviceController extends BaseController {
@Autowired
private DeviceService deviceService;
@ApiOperation("商户通过设备IDS查询")
@GetMapping("/listByIds/{ids}")
public AjaxResult listByIds(@PathVariable List<Long> ids)
{
List<DeviceVO> list = deviceService.selectListByIds(ids, getUserId());
return success(list);
}
}

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

@ -0,0 +1,33 @@
package com.ruoyi.web.controller.mch;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.ss.suit.domain.SuitQuery;
import com.ruoyi.ss.suit.service.SuitService;
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;
/**
* @author wjh
* 2024/7/30
*/
@RestController
@RequestMapping("/mch/suit")
public class MchSuitController extends BaseController {
@Autowired
private SuitService suitService;
@ApiOperation("获取用户的套餐列表")
@GetMapping("/list")
public TableDataInfo list(SuitQuery query) {
startPage();
query.setUserId(getUserId());
return getDataTable(suitService.selectSuitList(query));
}
}