Compare commits

..

No commits in common. "87e5366d7d5b7e8321565892e5127b107351c97c" and "83f47aa6f8384564b828df8c0627d2abbadcbfc3" have entirely different histories.

6 changed files with 4 additions and 43 deletions

View File

@ -27,16 +27,4 @@ public class AppUserPackageController {
return service.findMyPackageList(userPackage);
}
/**
* type 104服务套餐 105项目次卡 106服务疗程 111拼团 112限时秒杀 114企业预约
* @param userPackage
* @return
*/
@Login
@GetMapping("/queryKytcs")
@ApiOperation("查询可用套餐数量")
public Result queryKytcs(UserPackage userPackage){
return service.queryKytcs(userPackage);
}
}

View File

@ -22,10 +22,8 @@ public interface UserPackageDao extends BaseMapper<UserPackage> {
IPage<UserPackage> findMyPackageList(Page<UserPackage> page, @Param("params") UserPackage userPackage);
List<UserPackage> queryKytcs(@Param("params") UserPackage userPackage);
UserPackage getMyPackageById(Long id);
int deletePackageByOrders(Long ordersId);
}
}

View File

@ -143,7 +143,4 @@ public class UserPackage implements Serializable {
private Integer limit;
public UserPackage() {}
@TableField(exist = false)
private int count;
}

View File

@ -21,6 +21,4 @@ public interface UserPackageService extends IService<UserPackage> {
int deletePackageByOrders(Long ordersId);
List<UserPackage> findList(Long ordersId);
Result queryKytcs(UserPackage userPackage);
}
}

View File

@ -45,11 +45,6 @@ public class UserPackageServiceImpl extends ServiceImpl<UserPackageDao, UserPack
return Result.success().put("data",baseMapper.findMyPackageList(pages,userPackage));
}
@Override
public Result queryKytcs(UserPackage userPackage){
return Result.success().put("data",baseMapper.queryKytcs(userPackage));
}
@Override
public UserPackage getMyPackageById(Long id){
return baseMapper.getMyPackageById(id);
@ -67,4 +62,4 @@ public class UserPackageServiceImpl extends ServiceImpl<UserPackageDao, UserPack
return baseMapper.findList(userPackage);
}
}
}

View File

@ -126,21 +126,6 @@
order by a.id desc
</select>
<select id="queryKytcs" resultType="com.sqx.modules.bl.order.entity.UserPackage">
SELECT
a.type,
count( a.id ) count
FROM
bl_user_package a
WHERE
a.user_id = #{params.userId}
AND a.type IN ( 104, 105, 106, 111, 112, 114 )
AND a.STATUS = 1
GROUP BY
a.type
</select>
<select id="getMyPackageById" resultType="com.sqx.modules.bl.order.entity.UserPackage">
select
a.id,
@ -176,4 +161,4 @@
WHERE orders_id = #{ordersId}
</update>
</mapper>
</mapper>