Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java

src/main/java/com/sqx/modules/bl/order/app/AppUserPackageController.java

@@ -27,4 +27,16 @@ 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);
+    }
+
 }

src/main/java/com/sqx/modules/bl/order/dao/UserPackageDao.java

@@ -22,6 +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);

src/main/java/com/sqx/modules/bl/order/entity/UserPackage.java

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

src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java

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

src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageServiceImpl.java

@@ -45,6 +45,11 @@ 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);

src/main/resources/mapper/bl/order/UserPackageDao.xml

@@ -126,6 +126,21 @@
         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,