Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
b0d51545f3
4 changed files with 18 additions and 9 deletions
  1. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxGameActionLogMapper.java
  3. +1
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java
  4. +7
    -1
      mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml

+ 8
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxUserResume.java View File

@@ -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;


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxGameActionLogMapper.java View File

@@ -16,4 +16,6 @@ public interface WxGameActionLogMapper extends CommonMapper<WxGameActionLog, Str
WxGameUserActionLogVo findUserSumList(WxGameActionLog wxGameActionLog);
List<WxGameActionLog> findUserGiftList(WxGameActionLog wxGameActionLog);
}

+ 1
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java View File

@@ -127,14 +127,7 @@ public class WxGameServiceImpl implements WxGameService {
@Override
public List<WxGameActionLog> listUserGiftList(WxGameActionLog record) {
// PageInfo<WxGame> 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


+ 7
- 1
mallinkService/src/main/resources/mapper/WxGameActionLogMapper.xml View File

@@ -169,8 +169,14 @@
#{uidItem}
</foreach>
</if>
group by user_id
</select>
<select id="findUserGiftList" parameterType="com.iformall.domain.po.WxGameActionLog" resultMap="BaseResultMap">
select
from wx_game_action_log
</select>

</mapper>

Loading…
Cancel
Save