diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java index 60300f646..7194545bb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java @@ -61,6 +61,14 @@ public class WxUserResume extends TenantEntity { } return null; } + @TableField(exist = false) + private String birthDayStr; + public String getBirthDayStr() { + if (null != birthDay) { + return DateUtils.date2String(birthDay,DateUtils.DATE_PATTERN); + } + return null; + } @io.swagger.annotations.ApiModelProperty(value="",name="createTime") private Date createTime; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxGameActionLogMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxGameActionLogMapper.java index f382d1ab6..a1633e745 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxGameActionLogMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxGameActionLogMapper.java @@ -16,4 +16,6 @@ public interface WxGameActionLogMapper extends CommonMapper findUserGiftList(WxGameActionLog wxGameActionLog); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index cebb2c889..a29fa7559 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -127,14 +127,7 @@ public class WxGameServiceImpl implements WxGameService { @Override public List listUserGiftList(WxGameActionLog record) { -// PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxGameMapper.findList(record)); -// if (page.getSize() > 0) { -// for (WxGame game : page.getList()) { -// game.setGameTemplate(wxGameTemplateService.getById(game.getGameId())); -// } -// } -// return page; - return null; + return wxGameActionLogMapper.findUserGiftList(record); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml index a06460a89..62247ef95 100644 --- a/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml @@ -169,8 +169,14 @@ #{uidItem} - group by user_id + + +