fix
This commit is contained in:
@@ -33,7 +33,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void insertFill(MetaObject metaObject) {
|
public void insertFill(MetaObject metaObject) {
|
||||||
log.info("start insert fill ....");
|
|
||||||
// this.setFieldValByName("createdTime", getDate(), metaObject);
|
// this.setFieldValByName("createdTime", getDate(), metaObject);
|
||||||
this.setFieldValByName("deleted", false, metaObject);
|
this.setFieldValByName("deleted", false, metaObject);
|
||||||
this.setFieldValByName("version", 1L, metaObject);
|
this.setFieldValByName("version", 1L, metaObject);
|
||||||
@@ -47,7 +46,6 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateFill(MetaObject metaObject) {
|
public void updateFill(MetaObject metaObject) {
|
||||||
log.info("start update fill ....");
|
|
||||||
// this.setFieldValByName("updatedTime", getDate(), metaObject);
|
// this.setFieldValByName("updatedTime", getDate(), metaObject);
|
||||||
Object createUser = this.getFieldValByName("updatedBy", metaObject);
|
Object createUser = this.getFieldValByName("updatedBy", metaObject);
|
||||||
if (createUser == null) {
|
if (createUser == null) {
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package com.starry.admin.modules.clerk.module.entity;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
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 com.starry.common.domain.BaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
@@ -45,7 +45,7 @@ public class PlayClerkDataReviewInfoEntity extends BaseEntity<PlayClerkDataRevie
|
|||||||
/**
|
/**
|
||||||
* 资料内容
|
* 资料内容
|
||||||
*/
|
*/
|
||||||
@TableField(typeHandler = StringTypeHandler.class)
|
@TableField(typeHandler = ListToStringHandle.class)
|
||||||
private List<String> dataContent;
|
private List<String> dataContent;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -40,12 +40,12 @@ public class PlayClerkDataReviewReturnVo {
|
|||||||
/**
|
/**
|
||||||
* 资料类型[0:昵称;1:头像;2:相册;3:录音]
|
* 资料类型[0:昵称;1:头像;2:相册;3:录音]
|
||||||
*/
|
*/
|
||||||
private String dateType;
|
private String dataType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 资料内容
|
* 资料内容
|
||||||
*/
|
*/
|
||||||
private List<String> dateContent;
|
private List<String> dataContent;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 审核状态(0:未审核:1:审核通过,2:审核不通过)
|
* 审核状态(0:未审核:1:审核通过,2:审核不通过)
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.starry.admin.modules.weichat.controller;
|
package com.starry.admin.modules.weichat.controller;
|
||||||
|
|
||||||
|
|
||||||
import com.starry.common.utils.IdUtils;
|
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
import com.alibaba.fastjson2.JSONObject;
|
||||||
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
|
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
|
||||||
@@ -32,7 +31,10 @@ import org.springframework.web.bind.annotation.*;
|
|||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.math.BigDecimal;
|
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
|
* @author admin
|
||||||
@@ -143,7 +145,6 @@ public class WxPlayController {
|
|||||||
// 创建订单信息
|
// 创建订单信息
|
||||||
String orderNo = playOrderInfoService.getOrderNo();
|
String orderNo = playOrderInfoService.getOrderNo();
|
||||||
orderInfoService.createRechargeOrder(orderNo, new BigDecimal(totalFee * 1.0 / 100), new BigDecimal(totalFee * 1.0 / 100), customUserInfo.getId());
|
orderInfoService.createRechargeOrder(orderNo, new BigDecimal(totalFee * 1.0 / 100), new BigDecimal(totalFee * 1.0 / 100), customUserInfo.getId());
|
||||||
String body = "树洞充值";
|
|
||||||
|
|
||||||
WxPayService wxPayService = mpService.getWxPay();
|
WxPayService wxPayService = mpService.getWxPay();
|
||||||
WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
|
WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest();
|
||||||
|
|||||||
@@ -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<Integer> ==> string
|
||||||
|
*
|
||||||
|
* @Date 2022-10-08
|
||||||
|
*/
|
||||||
|
public class ListToStringHandle extends BaseTypeHandler<List> {
|
||||||
|
|
||||||
|
|
||||||
|
@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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Reference in New Issue
Block a user