diff --git a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java index 715169f..e25c037 100644 --- a/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java +++ b/play-admin/src/main/java/com/starry/admin/common/mybatis/handler/MyMetaObjectHandler.java @@ -33,7 +33,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { - log.info("start insert fill ...."); // this.setFieldValByName("createdTime", getDate(), metaObject); this.setFieldValByName("deleted", false, metaObject); this.setFieldValByName("version", 1L, metaObject); @@ -47,7 +46,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void updateFill(MetaObject metaObject) { - log.info("start update fill ...."); // this.setFieldValByName("updatedTime", getDate(), metaObject); Object createUser = this.getFieldValByName("updatedBy", metaObject); if (createUser == null) { diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoEntity.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoEntity.java index ca1cb31..5f3468f 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoEntity.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoEntity.java @@ -2,7 +2,7 @@ package com.starry.admin.modules.clerk.module.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.starry.admin.common.conf.StringTypeHandler; +import com.starry.admin.utils.ListToStringHandle; import com.starry.common.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -45,7 +45,7 @@ public class PlayClerkDataReviewInfoEntity extends BaseEntity dataContent; /** diff --git a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java index 6f2a4f3..3ea5839 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java +++ b/play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java @@ -40,12 +40,12 @@ public class PlayClerkDataReviewReturnVo { /** * 资料类型[0:昵称;1:头像;2:相册;3:录音] */ - private String dateType; + private String dataType; /** * 资料内容 */ - private List dateContent; + private List dataContent; /** * 审核状态（0：未审核:1：审核通过，2：审核不通过） diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java index 714862a..41919c9 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java @@ -1,7 +1,6 @@ package com.starry.admin.modules.weichat.controller; -import com.starry.common.utils.IdUtils; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONObject; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; @@ -32,7 +31,10 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; /** * @author admin @@ -143,7 +145,6 @@ public class WxPlayController { // 创建订单信息 String orderNo = playOrderInfoService.getOrderNo(); orderInfoService.createRechargeOrder(orderNo, new BigDecimal(totalFee * 1.0 / 100), new BigDecimal(totalFee * 1.0 / 100), customUserInfo.getId()); - String body = "树洞充值"; WxPayService wxPayService = mpService.getWxPay(); WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest(); diff --git a/play-admin/src/main/java/com/starry/admin/utils/ListToStringHandle.java b/play-admin/src/main/java/com/starry/admin/utils/ListToStringHandle.java new file mode 100644 index 0000000..dc57dd8 --- /dev/null +++ b/play-admin/src/main/java/com/starry/admin/utils/ListToStringHandle.java @@ -0,0 +1,58 @@ +package com.starry.admin.utils; + +/** + * @Author: huchuansai + * @Date: 2024/3/5 11:52 AM + * @Description: + */ + +import com.alibaba.fastjson2.JSON; +import com.alibaba.fastjson2.JSONArray; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; + +import java.sql.CallableStatement; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +/** + * List ==> string + * + * @Date 2022-10-08 + */ +public class ListToStringHandle extends BaseTypeHandler { + + + @Override + public void setNonNullParameter(PreparedStatement preparedStatement, int i, List list, JdbcType jdbcType) throws SQLException { + if (CollectionUtils.isNotEmpty(list)) { + preparedStatement.setString(i, JSON.toJSONString(list)); + } else { + preparedStatement.setString(i, null); + } + + } + + @Override + public List getNullableResult(ResultSet resultSet, String s) throws SQLException { + String result = resultSet.getString(s); + return result == null ? new ArrayList<>() : JSONArray.parseArray(result); + } + + @Override + public List getNullableResult(ResultSet resultSet, int i) throws SQLException { + String result = resultSet.getString(i); + return result == null ? new ArrayList<>() : JSONArray.parseArray(result); + } + + @Override + public List getNullableResult(CallableStatement callableStatement, int i) throws SQLException { + String result = callableStatement.getString(i); + return result == null ? new ArrayList<>() : JSONArray.parseArray(result); + } +} +