diff --git a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql index 5acbb2a..06d2a40 100644 --- a/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql +++ b/suimangAdmin/src/main/resources/db/migration/V2023110300001_personmould.sql @@ -10,3 +10,6 @@ ALTER TABLE `voice_language` ADD COLUMN customized int(1) NOT NULL DEFAULT 0 COMMENT '是否私人定制EnumYesOrNo' AFTER `is_del`; ALTER TABLE `voice_language` ADD COLUMN customized_user_id BIGINT(11) COMMENT '私人定制所属用户' AFTER `customized`; + + + diff --git a/suimangCApi/src/main/java/com/iformall/controller/BaseController.java b/suimangCApi/src/main/java/com/iformall/controller/BaseController.java index 571c475..02a9ece 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/BaseController.java @@ -130,4 +130,12 @@ public class BaseController { return ipaddress; } + public Integer getPoins() { + WxCUserBasicInfo cuser = getCUser(); + WxCUserBasicInfo newcuser = wxCUserBasicInfoService.getById(cuser.getId(), cuser.getFinalTenantId()); + if (newcuser == null) { + throw new MallinkException(ErrorCode.USER_IS_EMPTY); + } + return newcuser.getPoins(); + } } diff --git a/suimangCApi/src/main/java/com/iformall/controller/LevelPackageController.java b/suimangCApi/src/main/java/com/iformall/controller/LevelPackageController.java deleted file mode 100644 index 7d7de76..0000000 --- a/suimangCApi/src/main/java/com/iformall/controller/LevelPackageController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.iformall.controller; - -import com.github.pagehelper.PageInfo; -import com.iformall.common.ErrorCode; -import com.iformall.common.ResultData; -import com.iformall.domain.po.UserBasicFrom; -import com.iformall.domain.po.base.BaseEntity; -import com.iformall.service.UserBasicFromService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - - -@RestController -@RequestMapping("/api/levelPackage") -@Api(description = "查套餐") -public class LevelPackageController extends BaseController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - -} diff --git a/suimangCApi/src/main/java/com/iformall/controller/ProductController.java b/suimangCApi/src/main/java/com/iformall/controller/ProductController.java index f1df1e9..965227e 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/ProductController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/ProductController.java @@ -40,7 +40,7 @@ public class ProductController extends BaseController { private ProductService productService; @AuthIgnore - @ApiOperation("分页列表接口") + @ApiOperation("分页列表接口(仅智象小程序用)") @GetMapping("list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @@ -55,7 +55,7 @@ public class ProductController extends BaseController { @AuthIgnore - @ApiOperation("获取商品列表") + @ApiOperation("获取商品列表(通用,将来替换list)") @GetMapping("list_v1") @ApiImplicitParams({}) public ResultData list_v1(@ModelAttribute Product record) { diff --git a/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java b/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java index 8598513..3b40d75 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/UserMouldVideoController.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.sm.MouldPatch; import com.iformall.domain.po.sm.MouldPatchSign; @@ -159,6 +160,12 @@ public class UserMouldVideoController extends BaseController { if(record.getId() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + + //判断当前用户是有金币 + if (this.getPoins() <= 0 ) { + return new ResultData(ErrorCode.MEMBER_NO_POINTS); + } + UserMouldVideo mouldVideo = userMouldVideoService.getById(record.getId()); logger.info("TEST--"+ JSONObject.toJSONString(mouldVideo)); diff --git a/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index b277497..9be1154 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -112,8 +112,7 @@ public class WxUserGrantController extends BaseController { @Autowired private WxCUserAuthorityService wxCUserAuthorityService; - - + @AuthIgnore @ApiOperation("验证码") @GetMapping("/captcha.jpg") @@ -788,9 +787,10 @@ public class WxUserGrantController extends BaseController { @AuthIgnore @ApiOperation("套餐档次查询") @GetMapping("/getPackageInfo") + @Deprecated public ResultData getPackageInfo() { logger.debug("[" + getIpAddr() + "] WxUserGrantController::getPackageInfo"); return new ResultData(userConsumptionPackageService.getPackageInfo()); } - + } diff --git a/suimangService/src/main/java/com/iformall/common/ErrorCode.java b/suimangService/src/main/java/com/iformall/common/ErrorCode.java index 34c2452..8da03d7 100644 --- a/suimangService/src/main/java/com/iformall/common/ErrorCode.java +++ b/suimangService/src/main/java/com/iformall/common/ErrorCode.java @@ -676,6 +676,7 @@ public enum ErrorCode{ * mould */ ORDER_CREAT_OVERRUN(64000, "重复生成次数超限"), + MEMBER_NO_POINTS(64001,"当前账户无足额金币"), CODE_ALREADY_EXISTS(71000, "该code已存在"), @@ -684,6 +685,7 @@ public enum ErrorCode{ NAME_REPEAT(81000, "名称重复"), EXIST_AVAILABLE_GUIDE(81001, "存在可用指南"), + ; private int code; diff --git a/suimangService/src/main/java/com/iformall/domain/po/LevelPackage.java b/suimangService/src/main/java/com/iformall/domain/po/LevelPackage.java deleted file mode 100644 index a12abb6..0000000 --- a/suimangService/src/main/java/com/iformall/domain/po/LevelPackage.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.iformall.domain.po; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.Date; - -@TableName(value = "level_package") -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -public class LevelPackage extends TenantEntity { - - protected Long id; - - @io.swagger.annotations.ApiModelProperty(value="等级",name="level") - private Integer level; - - @io.swagger.annotations.ApiModelProperty(value="名称",name="name") - private String name; - - @io.swagger.annotations.ApiModelProperty(value="",name="en_name") - private String en_name; - @io.swagger.annotations.ApiModelProperty(value="套餐色",name="color") - private String color; - - @io.swagger.annotations.ApiModelProperty(value="",name="priceDollar") - private Integer priceDollar; - @io.swagger.annotations.ApiModelProperty(value="",name="priceRmb") - private Integer priceRmb; - - @io.swagger.annotations.ApiModelProperty(value="套餐积分",name="credit") - private Integer credit; - @io.swagger.annotations.ApiModelProperty(value="套餐时长",name="validityDuration") - private Integer validityDuration; - - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") - private Date createDate; - @io.swagger.annotations.ApiModelProperty(value="",name="updateDate") - private Date updateDate; - - @TableField(exist = false) - private Date startDate; - - @TableField(exist = false) - private Date endDate; - - @TableField(exist = false) - private ProjectPackageDetail projectPackageDetail; - -} diff --git a/suimangService/src/main/java/com/iformall/domain/po/Product.java b/suimangService/src/main/java/com/iformall/domain/po/Product.java index 8bf6b73..27ea6a8 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/Product.java +++ b/suimangService/src/main/java/com/iformall/domain/po/Product.java @@ -23,7 +23,7 @@ public class Product extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="EnumProductType",name="type") private Integer type; - @io.swagger.annotations.ApiModelProperty(value="",name="extraId") + @io.swagger.annotations.ApiModelProperty(value="套餐表(level_package,project_package_detail)ID,",name="extraId") private Long extraId; @io.swagger.annotations.ApiModelProperty(value="",name="coverImg") diff --git a/suimangService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/suimangService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 13144c2..0e84aa1 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -107,8 +107,8 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { @io.swagger.annotations.ApiModelProperty(value="登录次数",name="loginCount") private Integer loginCount; - @Excel(name="成长值",width = 20, orderNum = "11") - @io.swagger.annotations.ApiModelProperty(value="成长值",name="poins") + @Excel(name="金币",width = 20, orderNum = "11") + @io.swagger.annotations.ApiModelProperty(value="金币",name="poins") private Integer poins; @io.swagger.annotations.ApiModelProperty(value="地址",name="address") diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiDetail.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiDetail.java index 0bbf7ba..bb3cd25 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiDetail.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiDetail.java @@ -1,10 +1,9 @@ package com.iformall.domain.po.sm; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; +import com.iformall.domain.po.base.BaseEntity; import java.util.Date; import lombok.Data; @@ -14,7 +13,7 @@ import lombok.Data; */ @TableName(value ="api_detail") @Data -public class ApiDetail implements Serializable { +public class ApiDetail extends BaseEntity { /** * 详情id */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java index 2598ccc..07a750f 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiGuide.java @@ -1,10 +1,9 @@ package com.iformall.domain.po.sm; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; +import com.iformall.domain.po.base.BaseEntity; import java.util.Date; import lombok.Data; @@ -14,7 +13,7 @@ import lombok.Data; */ @TableName(value ="api_guide") @Data -public class ApiGuide implements Serializable { +public class ApiGuide extends BaseEntity { /** * 主键id */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java index ab94f22..7c8658d 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ApiMenu.java @@ -1,10 +1,9 @@ package com.iformall.domain.po.sm; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; +import com.iformall.domain.po.base.BaseEntity; import java.util.Date; import lombok.Data; @@ -14,7 +13,7 @@ import lombok.Data; */ @TableName(value ="api_menu") @Data -public class ApiMenu implements Serializable { +public class ApiMenu extends BaseEntity { /** * 菜单id */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/InviteCode.java b/suimangService/src/main/java/com/iformall/domain/po/sm/InviteCode.java index 549f533..dc495d6 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/InviteCode.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/InviteCode.java @@ -2,6 +2,8 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; + import io.swagger.models.auth.In; import lombok.Data; @@ -15,7 +17,7 @@ import java.util.Date; */ @Data @TableName("invite_code") -public class InviteCode implements Serializable { +public class InviteCode extends TenantEntity { private static final long serialVersionUID = 6951051673755053615L; /** @@ -23,14 +25,6 @@ public class InviteCode implements Serializable { */ @TableId private Long id; - /** - * 租户ID - */ - private String tenantId; - /** - * 父租户ID - */ - private String parentTenantId; /** * 用户id(wx_c_user_basic_info.id) */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/InviteCodeInfo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/InviteCodeInfo.java index bf74252..b57b18c 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/InviteCodeInfo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/InviteCodeInfo.java @@ -3,6 +3,8 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; + import io.swagger.models.auth.In; import lombok.Data; import lombok.ToString; @@ -17,7 +19,7 @@ import java.util.Date; */ @Data @TableName("invite_code_info") -public class InviteCodeInfo implements Serializable { +public class InviteCodeInfo extends TenantEntity { private static final long serialVersionUID = 5349786757453017803L; /** @@ -25,14 +27,6 @@ public class InviteCodeInfo implements Serializable { */ @TableId private Long id; - /** - * 租户ID - */ - private String tenantId; - /** - * 父租户ID - */ - private String parentTenantId; /** * 邀请的用户id(wx_c_user_basic_info.id) */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceInfo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceInfo.java index 40b0483..7cabe76 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceInfo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceInfo.java @@ -2,6 +2,9 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; + import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -16,7 +19,7 @@ import java.util.Date; */ @TableName(value = "service_info") @Data -public class ServiceInfo { +public class ServiceInfo extends BaseEntity{ /** * 接入商id,唯一标识 diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceVideoRecord.java b/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceVideoRecord.java index 6693f41..25b9991 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceVideoRecord.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/ServiceVideoRecord.java @@ -2,6 +2,8 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.BaseEntity; + import lombok.Data; import java.util.Date; @@ -12,7 +14,7 @@ import java.util.Date; */ @TableName(value = "service_video_record") @Data -public class ServiceVideoRecord { +public class ServiceVideoRecord extends BaseEntity{ /** * 主键id */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserConsumptionPackage.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserConsumptionPackage.java index 707b3c0..4eb7ead 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserConsumptionPackage.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserConsumptionPackage.java @@ -3,6 +3,8 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; + import java.util.Date; import java.io.Serializable; import lombok.Data; @@ -17,7 +19,7 @@ import java.util.List; */ @Data @TableName("user_consumption_package" ) -public class UserConsumptionPackage implements Serializable { +public class UserConsumptionPackage extends TenantEntity { private static final long serialVersionUID = 7987400196899039170L; @@ -27,16 +29,6 @@ public class UserConsumptionPackage implements Serializable { @TableId private Integer id; - /** - * 租户ID - */ - private String tenantId; - - /** - * 父租户ID - */ - private String parentTenantId; - /** * 套餐类型(1、基础版,2、专业版,3、加强版) */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreateVideoNum.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreateVideoNum.java index 2730523..06e7bf0 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreateVideoNum.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreateVideoNum.java @@ -2,6 +2,8 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; + import java.util.Date; import java.io.Serializable; import lombok.Data; @@ -14,7 +16,7 @@ import lombok.Data; */ @Data @TableName("user_create_video_num" ) -public class UserCreateVideoNum implements Serializable { +public class UserCreateVideoNum extends TenantEntity { private static final long serialVersionUID = 4995993777308528646L; @@ -24,16 +26,6 @@ public class UserCreateVideoNum implements Serializable { @TableId private Long id; - /** - * 租户ID - */ - private String tenantId; - - /** - * 父租户ID - */ - private String parentTenantId; - /** * 用户id(wx_c_user_basic_info.id) */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreditLog.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreditLog.java index 650d038..b4d002e 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreditLog.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserCreditLog.java @@ -2,6 +2,8 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; + import java.util.Date; import java.io.Serializable; @@ -16,7 +18,7 @@ import lombok.Data; */ @Data @TableName("user_credit_log" ) -public class UserCreditLog implements Serializable { +public class UserCreditLog extends TenantEntity { private static final long serialVersionUID = 8595480777599856051L; @@ -26,16 +28,6 @@ public class UserCreditLog implements Serializable { @TableId private Long id; - /** - * 租户ID - */ - private String tenantId; - - /** - * 父租户ID - */ - private String parentTenantId; - /** * 用户id(wx_c_user_basic_info.id) */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserPackageDetail.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserPackageDetail.java index 6d654c5..0be483b 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserPackageDetail.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserPackageDetail.java @@ -3,6 +3,8 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; + import java.util.Date; import java.io.Serializable; import lombok.Data; @@ -15,7 +17,7 @@ import lombok.Data; */ @Data @TableName("user_package_detail" ) -public class UserPackageDetail implements Serializable { +public class UserPackageDetail extends TenantEntity { private static final long serialVersionUID = 8868339443558940187L; @@ -25,16 +27,6 @@ public class UserPackageDetail implements Serializable { @TableId private Integer id; - /** - * 租户ID - */ - private String tenantId; - - /** - * 父租户ID - */ - private String parentTenantId; - /** * 套餐类型(1、图片说话,2、口播) */ diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserTimeConfig.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserTimeConfig.java index 68f8465..aecf1a7 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserTimeConfig.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserTimeConfig.java @@ -2,6 +2,8 @@ package com.iformall.domain.po.sm; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.iformall.domain.po.base.TenantEntity; + import java.util.Date; import java.io.Serializable; @@ -16,7 +18,7 @@ import lombok.Data; */ @Data @TableName("user_time_config" ) -public class UserTimeConfig implements Serializable { +public class UserTimeConfig extends TenantEntity { private static final long serialVersionUID = 2953038588956565523L; @@ -33,10 +35,6 @@ public class UserTimeConfig implements Serializable { */ private Long time; - private String tenantId; - - private String parentTenantId; - private Date createDate; private Date updateDate; diff --git a/suimangService/src/main/java/com/iformall/mapper/LevelPackageMapper.java b/suimangService/src/main/java/com/iformall/mapper/LevelPackageMapper.java deleted file mode 100644 index a24c496..0000000 --- a/suimangService/src/main/java/com/iformall/mapper/LevelPackageMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iformall.mapper; - -import com.iformall.common.CommonMapper; -import com.iformall.domain.po.LevelPackage; - -import java.util.List; - -public interface LevelPackageMapper extends CommonMapper{ - - List findList(LevelPackage record); - -} diff --git a/suimangService/src/main/java/com/iformall/service/sm/LevelPackageService.java b/suimangService/src/main/java/com/iformall/service/sm/LevelPackageService.java deleted file mode 100644 index 29db44f..0000000 --- a/suimangService/src/main/java/com/iformall/service/sm/LevelPackageService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.iformall.service.sm; - - -import com.iformall.domain.po.LevelPackage; - -import java.util.List; - -public interface LevelPackageService { - - LevelPackage getDetailById(Long id, Integer projectType); - -} diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/LevelPackageServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/LevelPackageServiceImpl.java deleted file mode 100644 index 017f247..0000000 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/LevelPackageServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.iformall.service.sm.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.iformall.domain.po.LevelPackage; -import com.iformall.domain.po.ProjectPackageDetail; -import com.iformall.domain.po.sm.UserConsumptionPackage; -import com.iformall.domain.po.sm.UserPackageDetail; -import com.iformall.enums.EnumYesOrNo; -import com.iformall.enums.sm.*; -import com.iformall.mapper.LevelPackageMapper; -import com.iformall.mapper.ProjectPackageDetailMapper; -import com.iformall.mapper.UserConsumptionPackageMapper; -import com.iformall.service.sm.LevelPackageService; -import com.iformall.service.sm.UserConsumptionPackageService; -import com.iformall.service.sm.UserPackageDetailService; -import org.apache.commons.collections.CollectionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -@Service -public class LevelPackageServiceImpl implements LevelPackageService { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - @Autowired - LevelPackageMapper levelPackageMapper; - - @Autowired - ProjectPackageDetailMapper projectPackageDetailMapper; - - @Override - public LevelPackage getDetailById(Long id, Integer projectType) { - if(id == null){ - return null; - } - LevelPackage levelPackage = levelPackageMapper.selectById(id); - if(levelPackage != null){ - ProjectPackageDetail projectPackageDetail = projectPackageDetailMapper.selectByProject(levelPackage.getId(),projectType); - levelPackage.setProjectPackageDetail(projectPackageDetail); - } - return levelPackage; - } -} diff --git a/suimangService/src/main/resources/mapper/LevelPackageMapper.xml b/suimangService/src/main/resources/mapper/LevelPackageMapper.xml deleted file mode 100644 index da2bb15..0000000 --- a/suimangService/src/main/resources/mapper/LevelPackageMapper.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - `id`,`tenant_id`,`parent_tenant_id`, - `level`,`name`,`en_name`,`color`, - `price_dollar`,`price_rmb`,`credit`,`validity_duration`, - `create_date`,`update_date` - - - - where is_del = 0 - and `id` = #{id} - - and `tenant_id` = #{tenantId} - - - and `parent_tenant_id` = #{parentTenantId} - - and `level` = #{level} - - and `name` like concat('%', #{name},'%') - - - and `en_name` like concat('%', #{enName},'%') - - - - and `create_date` >= #{startDate} - - - and `create_date` <= #{endDate} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - -