diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/DiamondLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/DiamondLog.java new file mode 100644 index 0000000..3c5e169 --- /dev/null +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/DiamondLog.java @@ -0,0 +1,51 @@ +package com.bnyer.common.core.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 意心记录表 + */ +@ApiModel(value="com-bnyer-common-core-DiamondLog") +@Getter +@Setter +@ToString +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "img_diamond_log") +public class DiamondLog extends BaseDomain { + + /** + * 用户id + */ + @TableField(value = "user_id") + @ApiModelProperty(value="用户id") + private Long userId; + + /** + * 意心获取/消耗点数 + */ + @TableField(value = "diamond_num") + @ApiModelProperty(value="意心获取/消耗点数") + private Integer diamondNum; + + /** + * 获取/消耗原因 + */ + @TableField(value = "reason") + @ApiModelProperty(value="获取/消耗原因") + private String reason; + + /** + * 平台(0->Hub;1->抖音;2->快手;3->微信) + */ + @TableField(value = "`source`") + @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)") + private String source; + + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/GoldLog.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/GoldLog.java new file mode 100644 index 0000000..054ea80 --- /dev/null +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/GoldLog.java @@ -0,0 +1,50 @@ +package com.bnyer.common.core.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; + +/** + * 画意值记录 + */ +@ApiModel(value="com-bnyer-common-core-GoldLog") +@Getter +@Setter +@ToString +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "img_gold_log") +public class GoldLog extends BaseDomain { + + /** + * 用户id + */ + @TableField(value = "user_id") + @ApiModelProperty(value="用户id") + private Long userId; + + /** + * 画意值获取/消耗点数 + */ + @TableField(value = "gold_num") + @ApiModelProperty(value="画意值获取/消耗点数") + private Integer goldNum; + + /** + * 获取/消耗原因 + */ + @TableField(value = "reason") + @ApiModelProperty(value="获取/消耗原因") + private String reason; + + /** + * 平台(0->Hub;1->抖音;2->快手;3->微信) + */ + @TableField(value = "`source`") + @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)") + private String source; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/DiamondLogPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/DiamondLogPageDto.java new file mode 100644 index 0000000..d3cf821 --- /dev/null +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/DiamondLogPageDto.java @@ -0,0 +1,18 @@ +package com.bnyer.common.core.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@ApiModel("意心记录分页接收类") +public class DiamondLogPageDto extends BasePageDto { + + @ApiModelProperty(value="用户id") + private Long userId; + + @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)") + private String source; +} diff --git a/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/GoldLogPageDto.java b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/GoldLogPageDto.java new file mode 100644 index 0000000..a36afa0 --- /dev/null +++ b/bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/GoldLogPageDto.java @@ -0,0 +1,18 @@ +package com.bnyer.common.core.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@ApiModel("画意值记录分页接收类") +public class GoldLogPageDto extends BasePageDto { + + @ApiModelProperty(value="用户id") + private Long userId; + + @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)") + private String source; +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/RestTemplateConfiguration.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/RestTemplateConfiguration.java index 76c6de3..c98adf8 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/RestTemplateConfiguration.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/config/RestTemplateConfiguration.java @@ -20,8 +20,8 @@ public class RestTemplateConfiguration { @Bean public ClientHttpRequestFactory simpleClientHttpRequestFactory(){ SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); - factory.setConnectTimeout(15000); - factory.setReadTimeout(15000); + factory.setConnectTimeout(20000); + factory.setReadTimeout(20000); return factory; } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java index b54fa80..8bc63c1 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/FhMiniController.java @@ -396,6 +396,13 @@ public class FhMiniController extends BaseController { return AjaxResult.success(stableDiffusionService.textToImg(param)); } + + @ApiOperation(value="情侣头像") + @PostMapping(value = "/textToImgLove") + public AjaxResult textToImgLove(@Validated @RequestBody @ApiParam("情侣头像对象") TextToImgLoveDto param){ + return AjaxResult.success(stableDiffusionService.textToImgLove(param)); + } + @ApiOperation(value="获取绘画者ai绘画分页") @PostMapping(value = "/getAiPaintPage") public TableDataInfo getAiPaintPage(@Validated @RequestBody @ApiParam("ai绘画对象") AiPaintPageDto dto){ @@ -404,11 +411,10 @@ public class FhMiniController extends BaseController { return getDataTable(aiPaintList); } - @ApiOperation(value="生成cdk") - @PostMapping(value = "/generatorCdk/{paintNum}") - public AjaxResult generatorCdk(@PathVariable int paintNum){ - paintCdkService.generatorCdk("2",paintNum); - return AjaxResult.success(); + @ApiOperation(value="获取绘画者ai绘画详情") + @GetMapping(value = "/getAiPaintDetails/{id}") + public AjaxResult getAiPaintDetails(@PathVariable @ApiParam("ai绘画对象id") Long id){ + return AjaxResult.success(aiPaintService.queryDetails(id)); } @ApiOperation(value="使用cdk") diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java index 44be988..9555d0d 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/TiktokMiniController.java @@ -91,6 +91,12 @@ public class TiktokMiniController extends BaseController { @Autowired private PaintCdkService paintCdkService; + @Autowired + private GoldLogService goldLogService; + + @Autowired + private DiamondLogService diamondLogService; + @ApiOperation(value="查询banner列表") @GetMapping(value = "/listBanner") public AjaxResult listBanner(){ @@ -466,4 +472,20 @@ public class TiktokMiniController extends BaseController { stableDiffusionService.setPaintButton(buttonValue); return AjaxResult.success(); } + + @ApiOperation(value="获取画意值记录") + @PostMapping(value = "/queryGoldLogPage") + public TableDataInfo queryGoldLogPage(@Validated @RequestBody @ApiParam("画意值对象") GoldLogPageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List goldLogs = goldLogService.queryPage(dto.getUserId(), "1"); + return getDataTable(goldLogs); + } + + @ApiOperation(value="获取意心记录") + @PostMapping(value = "/queryDiamondLogPage") + public TableDataInfo queryDiamondLogPage(@Validated @RequestBody @ApiParam("意心对象") DiamondLogPageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List diamondLogs = diamondLogService.queryPage(dto.getUserId(), "1"); + return getDataTable(diamondLogs); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java index f9d0e50..4af5c61 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/WxMiniController.java @@ -12,10 +12,7 @@ import com.bnyer.common.core.web.domain.AjaxResult; import com.bnyer.common.core.web.page.TableDataInfo; import com.bnyer.img.api.model.LoginWechatUser; import com.bnyer.img.service.*; -import com.bnyer.img.vo.CreatorDetailsVo; -import com.bnyer.img.vo.CreatorFollowVo; -import com.bnyer.img.vo.SignImgVo; -import com.bnyer.img.vo.TiktokImgVo; +import com.bnyer.img.vo.*; import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -85,6 +82,15 @@ public class WxMiniController extends BaseController { @Autowired private PromptService promptService; + @Autowired + private StableDiffusionService stableDiffusionService; + + @Autowired + private AiPaintService aiPaintService; + + @Autowired + private PaintCdkService paintCdkService; + @ApiOperation(value="查询banner列表") @GetMapping(value = "/listBanner") @@ -411,4 +417,37 @@ public class WxMiniController extends BaseController { public AjaxResult getPrompt(){ return AjaxResult.success(promptService.queryPromptList()); } + + @ApiOperation(value="文生图") + @PostMapping(value = "/textToImg") + public AjaxResult textToImg(@Validated @RequestBody @ApiParam("文生图对象") TextToImgDto param){ + return AjaxResult.success(stableDiffusionService.textToImg(param)); + } + + @ApiOperation(value="情侣头像") + @PostMapping(value = "/textToImgLove") + public AjaxResult textToImgLove(@Validated @RequestBody @ApiParam("情侣头像对象") TextToImgLoveDto param){ + return AjaxResult.success(stableDiffusionService.textToImgLove(param)); + } + + @ApiOperation(value="获取绘画者ai绘画分页") + @PostMapping(value = "/getAiPaintPage") + public TableDataInfo getAiPaintPage(@Validated @RequestBody @ApiParam("ai绘画对象") AiPaintPageDto dto){ + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List aiPaintList = aiPaintService.queryPage(dto); + return getDataTable(aiPaintList); + } + + @ApiOperation(value="获取绘画者ai绘画详情") + @GetMapping(value = "/getAiPaintDetails/{id}") + public AjaxResult getAiPaintDetails(@PathVariable @ApiParam("ai绘画对象id") Long id){ + return AjaxResult.success(aiPaintService.queryDetails(id)); + } + + @ApiOperation(value="使用cdk") + @PostMapping(value = "/useCdk") + public AjaxResult useCdk(@Validated @RequestBody @ApiParam("ai绘画对象") PaintCdkUseDto dto){ + paintCdkService.useCdk(dto.getCdk(),dto.getSource(),dto.getUserId(),dto.getAppType()); + return AjaxResult.success(); + } } diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/DiamondLogMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/DiamondLogMapper.java new file mode 100644 index 0000000..9d6a578 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/DiamondLogMapper.java @@ -0,0 +1,21 @@ +package com.bnyer.img.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.DiamondLog; +import com.bnyer.img.vo.DiamondLogVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface DiamondLogMapper extends BaseMapper { + + /** + * 获取意心记录 + * @param userId 用户id + * @param source 平台 + * @return - + */ + List queryPage(@Param("userId") Long userId, @Param("source") String source); +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/GoldLogMapper.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/GoldLogMapper.java new file mode 100644 index 0000000..77e9433 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/GoldLogMapper.java @@ -0,0 +1,21 @@ +package com.bnyer.img.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.bnyer.common.core.domain.GoldLog; +import com.bnyer.img.vo.GoldLogVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface GoldLogMapper extends BaseMapper { + + /** + * 获取画意值记录 + * @param userId 用户id + * @param source 平台 + * @return - + */ + List queryPage(@Param("userId") Long userId, @Param("source") String source); +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/DiamondLogService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/DiamondLogService.java new file mode 100644 index 0000000..c59026a --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/DiamondLogService.java @@ -0,0 +1,25 @@ +package com.bnyer.img.service; + +import com.bnyer.common.core.domain.DiamondLog; +import com.bnyer.common.core.domain.GoldLog; +import com.bnyer.img.vo.DiamondLogVo; + +import java.util.List; + +public interface DiamondLogService { + + /** + * 新增意心记录 + * @param goldLog 意心记录 + * @return - + */ + int insert(DiamondLog goldLog); + + /** + * 获取意心记录分页 + * @param userId 用户id + * @param source 平台(0->Hub;1->抖音;2->快手;3->微信) + * @return - + */ + List queryPage(Long userId, String source); +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/GoldLogService.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/GoldLogService.java new file mode 100644 index 0000000..df18464 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/GoldLogService.java @@ -0,0 +1,24 @@ +package com.bnyer.img.service; + +import com.bnyer.common.core.domain.GoldLog; +import com.bnyer.img.vo.GoldLogVo; + +import java.util.List; + +public interface GoldLogService { + + /** + * 新增画意值记录 + * @param goldLog 画意值记录 + * @return - + */ + int insert(GoldLog goldLog); + + /** + * 获取画意值记录分页 + * @param userId 用户id + * @param source 平台(0->Hub;1->抖音;2->快手;3->微信) + * @return - + */ + List queryPage(Long userId, String source); +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/DiamondLogServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/DiamondLogServiceImpl.java new file mode 100644 index 0000000..6363b73 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/DiamondLogServiceImpl.java @@ -0,0 +1,39 @@ +package com.bnyer.img.service.impl; + +import com.bnyer.common.core.domain.DiamondLog; +import com.bnyer.common.core.domain.GoldLog; +import com.bnyer.img.mapper.DiamondLogMapper; +import com.bnyer.img.mapper.GoldLogMapper; +import com.bnyer.img.service.DiamondLogService; +import com.bnyer.img.service.GoldLogService; +import com.bnyer.img.vo.DiamondLogVo; +import com.bnyer.img.vo.GoldLogVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Slf4j +@Service +public class DiamondLogServiceImpl implements DiamondLogService { + + @Autowired + private DiamondLogMapper diamondLogMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(DiamondLog diamondLog) { + diamondLog.setCreateTime(new Date()); + diamondLog.setUpdateTime(new Date()); + diamondLog.setSort(0); + return diamondLogMapper.insert(diamondLog); + } + + @Override + public List queryPage(Long userId, String source) { + return diamondLogMapper.queryPage(userId,source); + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/GoldLogServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/GoldLogServiceImpl.java new file mode 100644 index 0000000..9c3d9d5 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/GoldLogServiceImpl.java @@ -0,0 +1,37 @@ +package com.bnyer.img.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.bnyer.common.core.domain.GoldLog; +import com.bnyer.common.core.dto.GoldLogPageDto; +import com.bnyer.img.mapper.GoldLogMapper; +import com.bnyer.img.service.GoldLogService; +import com.bnyer.img.vo.GoldLogVo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; + +@Slf4j +@Service +public class GoldLogServiceImpl implements GoldLogService { + + @Autowired + private GoldLogMapper goldLogMapper; + + @Override + @Transactional(rollbackFor = Exception.class) + public int insert(GoldLog goldLog) { + goldLog.setCreateTime(new Date()); + goldLog.setUpdateTime(new Date()); + goldLog.setSort(0); + return goldLogMapper.insert(goldLog); + } + + @Override + public List queryPage(Long userId, String source) { + return goldLogMapper.queryPage(userId,source); + } +} diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/StableDiffusionServiceImpl.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/StableDiffusionServiceImpl.java index 2821197..c4d5df6 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/StableDiffusionServiceImpl.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/StableDiffusionServiceImpl.java @@ -311,7 +311,7 @@ public class StableDiffusionServiceImpl implements StableDiffusionService { //女头提示词 String girlHeadStr = "1个女孩" + activePrompt + resultPrompt; String boyHead = getCoupleHead(boyHeadStr,negaPrompt,param.getPlatform(), param.getPainterId(), param.getPainterName(), param.getStyleName(),button); - log.info("腾讯男头像提示词为：【{}】",boyHead); + log.info("腾讯男头像提示词为：【{}】",girlHeadStr); String girlHead = getCoupleHead(girlHeadStr,negaPrompt,param.getPlatform(), param.getPainterId(), param.getPainterName(), param.getStyleName(),button); log.info("腾讯女头像提示词为：【{}】",girlHeadStr); List imgList = new ArrayList<>(); diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/DiamondLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/DiamondLogVo.java new file mode 100644 index 0000000..c5023f3 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/DiamondLogVo.java @@ -0,0 +1,37 @@ +package com.bnyer.img.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.Date; + + +@Getter +@Setter +@ApiModel("意心记录响应体") +public class DiamondLogVo implements Serializable { + + @ApiModelProperty(value="主键Id") + private Long id; + + @ApiModelProperty(value="用户id") + private Long userId; + + @ApiModelProperty(value="意心获取/消耗点数") + private Integer diamondNum; + + @ApiModelProperty(value="获取/消耗原因") + private String reason; + @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)") + private String source; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="创建时间") + private Date createTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/GoldLogVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/GoldLogVo.java new file mode 100644 index 0000000..86ac839 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/GoldLogVo.java @@ -0,0 +1,37 @@ +package com.bnyer.img.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.Date; + + +@Getter +@Setter +@ApiModel("画意值记录响应体") +public class GoldLogVo implements Serializable { + + @ApiModelProperty(value="主键Id") + private Long id; + + @ApiModelProperty(value="用户id") + private Long userId; + + @ApiModelProperty(value="画意值获取/消耗点数") + private Integer goldNum; + + @ApiModelProperty(value="获取/消耗原因") + private String reason; + @ApiModelProperty(value="平台(0->Hub;1->抖音;2->快手;3->微信)") + private String source; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value="创建时间") + private Date createTime; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java index 4501a9f..6ceeb88 100644 --- a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/vo/ProductVo.java @@ -1,7 +1,5 @@ package com.bnyer.img.vo; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; @@ -13,7 +11,7 @@ import java.math.BigDecimal; @Getter @Setter -@ApiModel("banner响应体") +@ApiModel("产品响应体") public class ProductVo implements Serializable { @ApiModelProperty(value="主键id") private Long id; @@ -42,7 +40,7 @@ public class ProductVo implements Serializable { @ApiModelProperty(value="商品图片") private String productImg; - @ApiModelProperty(value="商品类型(0->直充;1->卡密)") + @ApiModelProperty(value="商品类型(0->直充;1->卡密;2->实物)") private String productType; @ApiModelProperty(value="商品使用说明") diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/DiamondLogMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/DiamondLogMapper.xml new file mode 100644 index 0000000..0c171fe --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/DiamondLogMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + id, user_id, diamond_num, reason, `source`, is_show, create_time, update_time, sort + + + + \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/GoldLogMapper.xml b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/GoldLogMapper.xml new file mode 100644 index 0000000..77b18fb --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/GoldLogMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + id, user_id, gold_num, reason, `source`, is_show, create_time, update_time, sort + + + + \ No newline at end of file