Browse Source

代码修复

master
主管理员 7 months ago
parent
commit
21993ccb71
19 changed files with 371 additions and 75 deletions
  1. +1
    -1
      applet-rice-api/applet-rice-api.iml
  2. +4
    -4
      applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java
  3. +2
    -2
      applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java
  4. +8
    -3
      applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java
  5. +1
    -1
      module-common/module-common.iml
  6. +7
    -1
      module-common/pom.xml
  7. +6
    -0
      module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java
  8. +6
    -6
      module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java
  9. +157
    -6
      module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java
  10. +1
    -1
      module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java
  11. +24
    -13
      module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java
  12. +1
    -1
      module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java
  13. +1
    -1
      module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java
  14. +1
    -1
      module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java
  15. +57
    -12
      module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue
  16. +19
    -9
      module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue
  17. +73
    -11
      module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts
  18. +1
    -1
      module-system/module-system.iml
  19. +1
    -1
      module-system/src/main/resources/application-dev.yml

+ 1
- 1
applet-rice-api/applet-rice-api.iml View File

@ -235,6 +235,7 @@
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
<orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
<orderEntry type="module" module-name="module-common" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="module" module-name="module-pay" />
<orderEntry type="library" name="Maven: com.alipay.sdk:alipay-sdk-java:4.11.33.ALL" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
@ -298,7 +299,6 @@
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />


+ 4
- 4
applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java View File

@ -64,8 +64,8 @@ public class ApiRiceInfoController {
//获取粉丝列表带分页
@ApiOperation(value="获取粉丝列表带分页", notes="获取粉丝列表带分页")
@GetMapping(value = "/getFansPageList")
public Result<?> getFansPageList(@RequestHeader("X-Access-Token") String token,PageBean pageBean){
return apiRiceService.getFansPageList(token,pageBean);
public Result<?> getFansPageList(@RequestHeader("X-Access-Token") String token,PageBean pageBean,String title){
return apiRiceService.getFansPageList(token,pageBean,title);
}
//获取个人邀请码
@ -147,8 +147,8 @@ public class ApiRiceInfoController {
//提现
@ApiOperation(value="提现", notes="提现")
@GetMapping(value = "/withdraw")
public Result<?> withdraw(@RequestHeader("X-Access-Token") String token,BigDecimal money){
return apiRiceService.withdraw(token,money);
public Result<?> withdraw(@RequestHeader("X-Access-Token") String token,BigDecimal money,String bankName,String bankNo){
return apiRiceService.withdraw(token,money,bankName,bankNo);
}


+ 2
- 2
applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java View File

@ -95,7 +95,7 @@ public interface ApiRiceService {
Result<?> getOrderDetail(String token, String id);
//获取粉丝列表带分页
Result<?> getFansPageList(String token,PageBean pageBean);
Result<?> getFansPageList(String token,PageBean pageBean,String title);
//获取购物车信息列表带分页
Result<?> getCartPageList(String token,PageBean pageBean);
@ -130,7 +130,7 @@ public interface ApiRiceService {
Result<?> recharge(String token, BigDecimal money);
//提现
Result<?> withdraw(String token,BigDecimal money);
Result<?> withdraw(String token,BigDecimal money,String bankName,String bankNo);
//确认收货


+ 8
- 3
applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java View File

@ -878,12 +878,13 @@ public class ApiRiceServiceImpl implements ApiRiceService {
//获取粉丝列表带分页
@Override
public Result<?> getFansPageList(String token,PageBean pageBean){
public Result<?> getFansPageList(String token,PageBean pageBean,String title){
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
Page<HanHaiMember> page = hanHaiMemberService
.lambdaQuery()
.eq(HanHaiMember::getShareId,hanHaiMember.getId())
.page(new Page<>(1, 10));
.like(null!=title,HanHaiMember::getNickName,title)
.page(new Page<>(pageBean.getPageNo(), pageBean.getPageSize()));
return Result.OK(page);
}
@ -1220,7 +1221,7 @@ public class ApiRiceServiceImpl implements ApiRiceService {
//提现
@Override
public Result<?> withdraw(String token,BigDecimal money){
public Result<?> withdraw(String token,BigDecimal money,String bankName,String bankNo){
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
//查询当前用户余额
BigDecimal userPrice = hanHaiMember.getMoney();
@ -1236,6 +1237,8 @@ public class ApiRiceServiceImpl implements ApiRiceService {
commonMoneyLog.setOldMoney(userPrice);
commonMoneyLog.setType(1);
commonMoneyLog.setState(0);
commonMoneyLog.setBankName(bankName);
commonMoneyLog.setBankNo(bankNo);
commonMoneyLog.setUserId(hanHaiMember.getId());
commonMoneyLogService.save(commonMoneyLog);
@ -1529,11 +1532,13 @@ public class ApiRiceServiceImpl implements ApiRiceService {
@Override
public Result<?> addOrUpdateCommonUser(String token, CommonUser commonUser){
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
commonUser.setState(0);
//根据用户标识查询改用户是否以申请
CommonUser one = commonUserService.lambdaQuery().eq(CommonUser::getUserId, hanHaiMember.getId()).one();
//如果为空则申请
if(one==null){
commonUser.setUserId(hanHaiMember.getId());
commonUser.setState(0);
commonUserService.save(commonUser);
}else{
//如果状态为1


+ 1
- 1
module-common/module-common.iml View File

@ -237,6 +237,7 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.6.10" level="project" />
<orderEntry type="library" name="Maven: bouncycastle:bcprov-jdk14:138" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
@ -271,7 +272,6 @@
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.8.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.2" level="project" />


+ 7
- 1
module-common/pom.xml View File

@ -38,6 +38,12 @@
<groupId>org.jeecgframework.boot</groupId>
<artifactId>base-core</artifactId>
</dependency>
</dependencies>
<dependency>
<groupId>com.vaadin.external.google</groupId>
<artifactId>android-json</artifactId>
<version>0.0.20131108.vaadin1</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

+ 6
- 0
module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java View File

@ -33,6 +33,12 @@ public class AppletLoginController {
}
//绑定手机号码
@ApiOperation(value="绑定手机号码", notes="绑定手机号码")
@GetMapping(value = "/bindPhone")
public Result<Object> bindPhone(String phoneCode){
return appletLoginService.bindPhone(phoneCode);
}


+ 6
- 6
module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java View File

@ -18,10 +18,10 @@ public interface AppletLoginService {
Result<Object> appletLogin(LoginReq loginReq);
// /**
// * 微信小程序登录绑定手机号码接口
// * @param loginReq
// * @return
// */
// Result<Object> bindPhone(LoginReq loginReq);
/**
* 微信小程序登录绑定手机号码接口
* @param code
* @return
*/
Result<Object> bindPhone(String code);
}

+ 157
- 6
module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java View File

@ -21,6 +21,17 @@ import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
import java.io.BufferedReader;
import java.io.DataOutputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.io.IOException;
/**
* @Author lzx
* @Date 2022-05-13 15:55
@ -105,17 +116,157 @@ public class AppletLoginServiceImpl implements AppletLoginService {
result.setCode(200);
// result.setMessage(member.getNickName()+"已于"+member.getCreateTime()+"注册成功!请勿重复注册!");
// // 未绑定手机号跳转授权绑定手机号
// if (StringUtils.isBlank(member.getPhone())) {
// result.setMessage("该微信用户尚未绑定手机号,请授权手机进行绑定");
// result.setCode(905);
// result.setResult(map);
// return result;
// }
if (StringUtils.isBlank(member.getPhone())) {
result.setMessage("该微信用户尚未绑定手机号,请授权手机进行绑定");
result.setCode(200);
result.setResult(map);
return result;
}
}
return result;
}
// private static final String APP_ID = mpAppId; // 替换为你的小程序AppID
// private static final String APP_SECRET = "YOUR_APP_SECRET"; // 替换为你的小程序AppSecret
private static final String TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s";
public String getAccessToken() throws Exception {
String requestUrl = String.format(TOKEN_URL, mpAppId, mpAppSecret);
URL url = new URL(requestUrl);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
try (BufferedReader br = new BufferedReader(
new InputStreamReader(conn.getInputStream(), "UTF-8"))) {
StringBuilder response = new StringBuilder();
String responseLine;
while ((responseLine = br.readLine()) != null) {
response.append(responseLine.trim());
}
org.json.JSONObject jsonResponse = new org.json.JSONObject(response.toString());
return jsonResponse.getString("access_token");
}
}
private static final String API_URL = "https://api.weixin.qq.com/wxa/business/getuserphonenumber";
public String getPhoneNumber(String code) throws Exception {
URL url = new URL(API_URL + "?access_token=" + this.getAccessToken());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("POST");
conn.setRequestProperty("Content-Type", "application/json; utf-8");
conn.setRequestProperty("Accept", "application/json");
conn.setDoOutput(true);
JSONObject jsonInput = new JSONObject();
jsonInput.put("code", code);
try (DataOutputStream os = new DataOutputStream(conn.getOutputStream())) {
byte[] input = jsonInput.toString().getBytes(StandardCharsets.UTF_8);
os.write(input, 0, input.length);
}
try (BufferedReader br = new BufferedReader(
new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8))) {
StringBuilder response = new StringBuilder();
String responseLine;
while ((responseLine = br.readLine()) != null) {
response.append(responseLine.trim());
}
//获取手机号码
return response.toString();
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public Result<Object> bindPhone(String code) {
try {
String phoneNumber = this.getPhoneNumber(code);
return Result.OK(phoneNumber);
}catch (Exception e){
return Result.error(e.getMessage());
}
}
//
// // 替换为你的小程序AppID和AppSecret
// private static final String APP_ID = "your_app_id";
// private static final String APP_SECRET = "your_app_secret";
//
// // 获取access_token的URL
// private static final String ACCESS_TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + APP_ID + "&secret=" + APP_SECRET;
//
// // 获取手机号的URL模板需替换ACCESS_TOKEN
// private static final String PHONE_NUMBER_URL_TEMPLATE = "https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s";
//
// public static String getPhoneNumber(String code) throws IOException {
// // Step 1: 获取access_token
// String accessToken = getAccessToken();
//
// // Step 2: 使用access_token和code获取手机号
// String phoneNumberUrl = String.format(PHONE_NUMBER_URL_TEMPLATE, accessToken);
//
// CloseableHttpClient httpClient = HttpClients.createDefault();
// HttpPost postRequest = new HttpPost(phoneNumberUrl);
//
// // 设置请求头如果需要
// // postRequest.setHeader("Content-Type", "application/json");
//
// // 设置请求体包含code
// JSONObject jsonBody = new JSONObject();
// jsonBody.put("code", code);
// StringEntity entity = new StringEntity(jsonBody.toString());
// postRequest.setEntity(entity);
//
// // 执行请求并获取响应
// CloseableHttpResponse response = httpClient.execute(postRequest);
// String responseString = EntityUtils.toString(response.getEntity());
//
// // 关闭响应和客户端
// response.close();
// httpClient.close();
//
// // 解析响应并返回手机号信息或错误信息
// JSONObject responseJson = new JSONObject(responseString);
// int errcode = responseJson.getInt("errcode");
// if (errcode == 0) {
// JSONObject phoneInfo = responseJson.getJSONObject("phone_info");
// return phoneInfo.getString("phoneNumber"); // 或根据需要返回其他信息
// } else {
// // 处理错误例如记录日志返回错误信息给前端等
// return "Error: " + responseJson.getString("errmsg");
// }
// }
//
// private static String getAccessToken() throws IOException {
// CloseableHttpClient httpClient = HttpClients.createDefault();
// try {
// // 执行GET请求获取access_token
// CloseableHttpResponse response = httpClient.execute(new HttpPost(ACCESS_TOKEN_URL));
// String responseString = EntityUtils.toString(response.getEntity());
//
// // 解析响应并返回access_token
// JSONObject responseJson = new JSONObject(responseString);
// return responseJson.getString("access_token");
// } finally {
// httpClient.close();
// }
// }
// /**
// * 微信小程序登录绑定手机号码接口
// * @param loginReq


+ 1
- 1
module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java View File

@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
/**
* @Description: 流水日志表
* @Author: jeecg-boot
* @Date: 2024-12-11
* @Date: 2024-12-17
* @Version: V1.0
*/
@Api(tags="流水日志表")


+ 24
- 13
module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/**
* @Description: 流水日志表
* @Author: jeecg-boot
* @Date: 2024-12-11
* @Date: 2024-12-17
* @Version: V1.0
*/
@Data
@ -50,28 +50,39 @@ public class CommonMoneyLog implements Serializable {
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode;
/**标题*/
@Excel(name = "标题", width = 15)
@ApiModelProperty(value = "标题")
/**流水标题*/
@Excel(name = "流水标题", width = 15)
@ApiModelProperty(value = "流水标题")
private java.lang.String title;
/**金额*/
@Excel(name = "金额", width = 15)
@ApiModelProperty(value = "金额")
/**变动金额*/
@Excel(name = "变动金额", width = 15)
@ApiModelProperty(value = "变动金额")
private java.math.BigDecimal money;
/**原金额*/
@Excel(name = "原金额", width = 15)
@ApiModelProperty(value = "原金额")
/**原钱包金额*/
@Excel(name = "原钱包金额", width = 15)
@ApiModelProperty(value = "原钱包金额")
private java.math.BigDecimal oldMoney;
/**类型*/
@Excel(name = "类型", width = 15)
@Excel(name = "类型", width = 15, dicCode = "pay_type")
@Dict(dicCode = "pay_type")
@ApiModelProperty(value = "类型")
private java.lang.Integer type;
/**状态*/
@Excel(name = "状态", width = 15)
@Excel(name = "状态", width = 15, dicCode = "pay_state")
@Dict(dicCode = "pay_state")
@ApiModelProperty(value = "状态")
private java.lang.Integer state;
/**用户标识*/
@Excel(name = "用户标识", width = 15)
@Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@ApiModelProperty(value = "用户标识")
private java.lang.String userId;
/**开户行*/
@Excel(name = "开户行", width = 15)
@ApiModelProperty(value = "开户行")
private java.lang.String bankName;
/**开户号*/
@Excel(name = "开户号", width = 15)
@ApiModelProperty(value = "开户号")
private java.lang.String bankNo;
}

+ 1
- 1
module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 流水日志表
* @Author: jeecg-boot
* @Date: 2024-12-11
* @Date: 2024-12-17
* @Version: V1.0
*/
public interface CommonMoneyLogMapper extends BaseMapper<CommonMoneyLog> {


+ 1
- 1
module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/**
* @Description: 流水日志表
* @Author: jeecg-boot
* @Date: 2024-12-11
* @Date: 2024-12-17
* @Version: V1.0
*/
public interface ICommonMoneyLogService extends IService<CommonMoneyLog> {


+ 1
- 1
module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* @Description: 流水日志表
* @Author: jeecg-boot
* @Date: 2024-12-11
* @Date: 2024-12-17
* @Version: V1.0
*/
@Service


+ 57
- 12
module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue View File

@ -4,6 +4,38 @@
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="流水标题">
<a-input placeholder="请输入流水标题" v-model="queryParam.title"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="类型">
<j-dict-select-tag placeholder="请选择类型" v-model="queryParam.type" dictCode="pay_type"/>
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="状态">
<j-dict-select-tag placeholder="请选择状态" v-model="queryParam.state" dictCode="pay_state"/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="用户标识">
<j-search-select-tag placeholder="请选择用户标识" v-model="queryParam.userId" dict="han_hai_member,nick_name,id"/>
</a-form-item>
</a-col>
</template>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a @click="handleToggleSearch" style="margin-left: 8px">
{{ toggleSearchStatus ? '收起' : '展开' }}
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
</a>
</span>
</a-col>
</a-row>
</a-form>
</div>
@ -99,6 +131,7 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import CommonMoneyLogModal from './modules/CommonMoneyLogModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
export default {
name: 'CommonMoneyLogList',
@ -122,34 +155,44 @@
}
},
{
title:'标题',
title:'流水标题',
align:"center",
dataIndex: 'title'
},
{
title:'金额',
title:'变动金额',
align:"center",
dataIndex: 'money'
},
{
title:'原金额',
title:'原钱包金额',
align:"center",
dataIndex: 'oldMoney'
},
{
title:'类型',
align:"center",
dataIndex: 'type'
dataIndex: 'type_dictText'
},
{
title:'状态',
align:"center",
dataIndex: 'state'
dataIndex: 'state_dictText'
},
{
title:'用户标识',
align:"center",
dataIndex: 'userId'
dataIndex: 'userId_dictText'
},
{
title:'开户行',
align:"center",
dataIndex: 'bankName'
},
{
title:'开户号',
align:"center",
dataIndex: 'bankNo'
},
{
title: '操作',
@ -185,12 +228,14 @@
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原金额',dictCode:''})
fieldList.push({type:'int',value:'type',text:'类型',dictCode:''})
fieldList.push({type:'int',value:'state',text:'状态',dictCode:''})
fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''})
fieldList.push({type:'string',value:'title',text:'流水标题',dictCode:''})
fieldList.push({type:'BigDecimal',value:'money',text:'变动金额',dictCode:''})
fieldList.push({type:'BigDecimal',value:'oldMoney',text:'原钱包金额',dictCode:''})
fieldList.push({type:'int',value:'type',text:'类型',dictCode:'pay_type'})
fieldList.push({type:'int',value:'state',text:'状态',dictCode:'pay_state'})
fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'})
fieldList.push({type:'string',value:'bankName',text:'开户行',dictCode:''})
fieldList.push({type:'string',value:'bankNo',text:'开户号',dictCode:''})
this.superFieldList = fieldList
}
}


+ 19
- 9
module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue View File

@ -4,33 +4,43 @@
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
<a-row>
<a-col :span="24">
<a-form-model-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
<a-input v-model="model.title" placeholder="请输入标题" ></a-input>
<a-form-model-item label="流水标题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="title">
<a-input v-model="model.title" placeholder="请输入流水标题" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
<a-input-number v-model="model.money" placeholder="请输入金额" style="width: 100%" />
<a-form-model-item label="变动金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="money">
<a-input-number v-model="model.money" placeholder="请输入变动金额" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="原金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney">
<a-input-number v-model="model.oldMoney" placeholder="请输入原金额" style="width: 100%" />
<a-form-model-item label="原钱包金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldMoney">
<a-input-number v-model="model.oldMoney" placeholder="请输入原钱包金额" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
<a-input-number v-model="model.type" placeholder="请输入类型" style="width: 100%" />
<j-dict-select-tag type="list" v-model="model.type" dictCode="pay_type" placeholder="请选择类型" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
<a-input-number v-model="model.state" placeholder="请输入状态" style="width: 100%" />
<j-dict-select-tag type="list" v-model="model.state" dictCode="pay_state" placeholder="请选择状态" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="用户标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userId">
<a-input v-model="model.userId" placeholder="请输入用户标识" ></a-input>
<j-search-select-tag v-model="model.userId" dict="han_hai_member,nick_name,id" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankName">
<a-input v-model="model.bankName" placeholder="请输入开户行" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="开户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bankNo">
<a-input v-model="model.bankNo" placeholder="请输入开户号" ></a-input>
</a-form-model-item>
</a-col>
</a-row>


+ 73
- 11
module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts View File

@ -5,69 +5,131 @@ import { render } from '/@/utils/common/renderUtils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '标题',
title: '流水标题',
align:"center",
dataIndex: 'title'
},
{
title: '金额',
title: '变动金额',
align:"center",
dataIndex: 'money'
},
{
title: '原金额',
title: '原钱包金额',
align:"center",
dataIndex: 'oldMoney'
},
{
title: '类型',
align:"center",
dataIndex: 'type'
dataIndex: 'type_dictText'
},
{
title: '状态',
align:"center",
dataIndex: 'state'
dataIndex: 'state_dictText'
},
{
title: '用户标识',
align:"center",
dataIndex: 'userId'
dataIndex: 'userId_dictText'
},
{
title: '开户行',
align:"center",
dataIndex: 'bankName'
},
{
title: '开户号',
align:"center",
dataIndex: 'bankNo'
},
];
//查询数据
export const searchFormSchema: FormSchema[] = [
{
label: "流水标题",
field: "title",
component: 'Input',
colProps: {span: 6},
},
{
label: "类型",
field: "type",
component: 'JDictSelectTag',
componentProps:{
dictCode:"pay_type"
},
colProps: {span: 6},
},
{
label: "状态",
field: "state",
component: 'JDictSelectTag',
componentProps:{
dictCode:"pay_state"
},
colProps: {span: 6},
},
{
label: "用户标识",
field: "userId",
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,nick_name,id"
},
colProps: {span: 6},
},
];
//表单数据
export const formSchema: FormSchema[] = [
{
label: '标题',
label: '流水标题',
field: 'title',
component: 'Input',
},
{
label: '金额',
label: '变动金额',
field: 'money',
component: 'InputNumber',
},
{
label: '原金额',
label: '原钱包金额',
field: 'oldMoney',
component: 'InputNumber',
},
{
label: '类型',
field: 'type',
component: 'InputNumber',
component: 'JDictSelectTag',
componentProps:{
dictCode:"pay_type"
},
},
{
label: '状态',
field: 'state',
component: 'InputNumber',
component: 'JDictSelectTag',
componentProps:{
dictCode:"pay_state"
},
},
{
label: '用户标识',
field: 'userId',
component: 'JSearchSelect',
componentProps:{
dict:"han_hai_member,nick_name,id"
},
},
{
label: '开户行',
field: 'bankName',
component: 'Input',
},
{
label: '开户号',
field: 'bankNo',
component: 'Input',
},
];

+ 1
- 1
module-system/module-system.iml View File

@ -301,6 +301,7 @@
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
<orderEntry type="module" module-name="module-common" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
@ -335,7 +336,6 @@
<orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:3.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:4.0.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.3.18" level="project" />


+ 1
- 1
module-system/src/main/resources/application-dev.yml View File

@ -146,7 +146,7 @@ spring:
#driver-class-name: com.mysql.cj.jdbc.Driver
#redis 配置
redis:
database: 0
database: 1
host: 124.223.79.104
lettuce:
pool:


Loading…
Cancel
Save