irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
hucs
2024-06-06 13:40:38 +08:00
parent 9673051679
commit fe66fa2f9b
5 changed files with 66 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkDataReviewInfoEntity.java
View File

@@ -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<PlayClerkDataRevie
/**
* 资料内容
*/
@TableField(typeHandler = StringTypeHandler.class)
@TableField(typeHandler = ListToStringHandle.class)
private List<String> dataContent;
/**

4
play-admin/src/main/java/com/starry/admin/modules/clerk/module/vo/PlayClerkDataReviewReturnVo.java
View File

@@ -40,12 +40,12 @@ public class PlayClerkDataReviewReturnVo {
/**
* 资料类型[0:昵称;1:头像;2:相册;3:录音]
*/
private String dateType;
private String dataType;
/**
* 资料内容
*/
private List<String> dateContent;
private List<String> dataContent;
/**
* 审核状态（0：未审核:1：审核通过，2：审核不通过）

7
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxPlayController.java
View File

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