Tenlion/system-operator-plugin
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改了协议关联的数据字典错误的问题

Browse Source
This commit is contained in:
1215525055@qq.com 2025-03-07 15:09:06 +08:00
parent f7de34c4da
commit 8ffeaeaec6
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/com/tenlion/operator/service/packageorder/IPackageOrderService.java
View File

@ -179,7 +179,7 @@ public interface IPackageOrderService {
*/ */
SuccessResultList<List<PackageOrderDTO>> listPage(ListPage page); SuccessResultList<List<PackageOrderDTO>> listPage(ListPage page);
List<PackageOrderDTO> list(String packageInfoId, String userId); List<PackageOrderDTO> listByUserAndInfo(String packageInfoId, String userId);
/** /**
* 套餐包-订单统计 * 套餐包-订单统计

7
src/main/java/cn/com/tenlion/operator/service/packageorder/impl/PackageOrderServiceImpl.java
View File

@ -176,9 +176,10 @@ public class PackageOrderServiceImpl extends DefaultBaseService implements IPack
} }
@Override @Override
public List<PackageOrderDTO> list(String packageInfoId, String userId) { public List<PackageOrderDTO> listByUserAndInfo(String packageInfoId, String userId) {
Map<String, Object> params = super.getHashMap(2); Map<String, Object> params = super.getHashMap(2);
params.put("packageInfoId", packageInfoId); params.put("packageInfoId", packageInfoId);
params.put("notCheckStatus", "不校验删除状态");
params.put("userId", userId); params.put("userId", userId);
return packageOrderDao.list(params); return packageOrderDao.list(params);
} }
@ -200,7 +201,7 @@ public class PackageOrderServiceImpl extends DefaultBaseService implements IPack
PackageInfoAppDTO infoAppDTO = orderDTO.getPackageInfoAppDTO(); PackageInfoAppDTO infoAppDTO = orderDTO.getPackageInfoAppDTO();
// 仅限购买1次的 // 仅限购买1次的
if(infoAppDTO.getPackageMode().equals("single")) { if(infoAppDTO.getPackageMode().equals("single")) {
List<PackageOrderDTO> list = list(orderDTO.getPackageInfoId(), orderDTO.getCreator()); List<PackageOrderDTO> list = listByUserAndInfo(orderDTO.getPackageInfoId(), orderDTO.getCreator());
Boolean exists = false; Boolean exists = false;
for(PackageOrderDTO dto : list) { for(PackageOrderDTO dto : list) {
if(dto.getPackagePayStatus().equals("1")) { if(dto.getPackagePayStatus().equals("1")) {
@ -232,7 +233,7 @@ public class PackageOrderServiceImpl extends DefaultBaseService implements IPack
PackageInfoAppDTO infoAppDTO = orderDTO.getPackageInfoAppDTO(); PackageInfoAppDTO infoAppDTO = orderDTO.getPackageInfoAppDTO();
// 仅限购买1次的 // 仅限购买1次的
if(infoAppDTO.getPackageMode().equals("single")) { if(infoAppDTO.getPackageMode().equals("single")) {
List<PackageOrderDTO> list = list(orderDTO.getPackageInfoId(), orderDTO.getCreator()); List<PackageOrderDTO> list = listByUserAndInfo(orderDTO.getPackageInfoId(), orderDTO.getCreator());
Boolean exists = false; Boolean exists = false;
for(PackageOrderDTO dto : list) { for(PackageOrderDTO dto : list) {
if(dto.getPackagePayStatus().equals("1")) { if(dto.getPackagePayStatus().equals("1")) {

5
src/main/resources/mybatis/mapper/packageorder/package-order-mapper.xml
View File

@ -301,7 +301,10 @@
ON ON
t1.package_info_id = t4.package_info_id t1.package_info_id = t4.package_info_id
WHERE WHERE
t1.is_delete = 0 1 = 1
<if test="notCheckStatus == null">
AND t1.is_delete = 0
</if>
<if test="keYong != null and keYong != ''"> <if test="keYong != null and keYong != ''">
AND t1.package_total_surplus_count > 0 AND t1.package_total_surplus_count > 0
</if> </if>