From 21993ccb7101deac1256480738b676fd39f05dc0 Mon Sep 17 00:00:00 2001 From: lzx_mac <2602107437@qq.com> Date: Wed, 18 Dec 2024 01:22:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applet-rice-api/applet-rice-api.iml | 2 +- .../api/controller/ApiRiceInfoController.java | 8 +- .../java/org/jeecg/api/service/ApiRiceService.java | 4 +- .../jeecg/api/service/impl/ApiRiceServiceImpl.java | 11 +- module-common/module-common.iml | 2 +- module-common/pom.xml | 8 +- .../api/controller/AppletLoginController.java | 6 + .../org/jeecg/api/service/AppletLoginService.java | 12 +- .../api/service/impl/AppletLoginServiceImpl.java | 163 ++++++++++++++++++++- .../controller/CommonMoneyLogController.java | 2 +- .../commonMoneyLog/entity/CommonMoneyLog.java | 37 +++-- .../mapper/CommonMoneyLogMapper.java | 2 +- .../service/ICommonMoneyLogService.java | 2 +- .../service/impl/CommonMoneyLogServiceImpl.java | 2 +- .../commonMoneyLog/vue/CommonMoneyLogList.vue | 69 +++++++-- .../vue/modules/CommonMoneyLogForm.vue | 28 ++-- .../commonMoneyLog/vue3/CommonMoneyLog.data.ts | 84 +++++++++-- module-system/module-system.iml | 2 +- .../src/main/resources/application-dev.yml | 2 +- 19 files changed, 371 insertions(+), 75 deletions(-) diff --git a/applet-rice-api/applet-rice-api.iml b/applet-rice-api/applet-rice-api.iml index cdbe7f2..2330136 100644 --- a/applet-rice-api/applet-rice-api.iml +++ b/applet-rice-api/applet-rice-api.iml @@ -235,6 +235,7 @@ + @@ -298,7 +299,6 @@ - diff --git a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java index 832bf68..bba7ea6 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/controller/ApiRiceInfoController.java @@ -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); } diff --git a/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java b/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java index b9d58fb..3a589e0 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/service/ApiRiceService.java @@ -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); //确认收货 diff --git a/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java b/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java index 79ddae7..46b0ab7 100644 --- a/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java +++ b/applet-rice-api/src/main/java/org/jeecg/api/service/impl/ApiRiceServiceImpl.java @@ -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 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 diff --git a/module-common/module-common.iml b/module-common/module-common.iml index c32a51e..1eb81f1 100644 --- a/module-common/module-common.iml +++ b/module-common/module-common.iml @@ -237,6 +237,7 @@ + @@ -271,7 +272,6 @@ - diff --git a/module-common/pom.xml b/module-common/pom.xml index 5a9f065..51e37fd 100644 --- a/module-common/pom.xml +++ b/module-common/pom.xml @@ -38,6 +38,12 @@ org.jeecgframework.boot base-core - + + com.vaadin.external.google + android-json + 0.0.20131108.vaadin1 + compile + + \ No newline at end of file diff --git a/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java b/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java index 4f00a29..937428b 100644 --- a/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java +++ b/module-common/src/main/java/org/jeecg/api/controller/AppletLoginController.java @@ -33,6 +33,12 @@ public class AppletLoginController { } + //绑定手机号码 + @ApiOperation(value="绑定手机号码", notes="绑定手机号码") + @GetMapping(value = "/bindPhone") + public Result bindPhone(String phoneCode){ + return appletLoginService.bindPhone(phoneCode); + } diff --git a/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java b/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java index b0dfac4..092c7e3 100644 --- a/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java +++ b/module-common/src/main/java/org/jeecg/api/service/AppletLoginService.java @@ -18,10 +18,10 @@ public interface AppletLoginService { Result appletLogin(LoginReq loginReq); -// /** -// * 微信小程序登录绑定手机号码接口 -// * @param loginReq -// * @return -// */ -// Result bindPhone(LoginReq loginReq); + /** + * 微信小程序登录绑定手机号码接口 + * @param code + * @return + */ + Result bindPhone(String code); } diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java index 1b659a5..70c2ffc 100644 --- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java @@ -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 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 diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java index b131094..ea759fd 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/controller/CommonMoneyLogController.java @@ -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="流水日志表") diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java index 11cd98e..807c629 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/entity/CommonMoneyLog.java @@ -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; } diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java index b4cfbf4..9a8ae8d 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/mapper/CommonMoneyLogMapper.java @@ -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 { diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java index 238e9bb..dc4aa98 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/ICommonMoneyLogService.java @@ -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 { diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java index bc65ee4..cf01784 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/service/impl/CommonMoneyLogServiceImpl.java @@ -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 diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue index 16e3954..a6e7cab 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/CommonMoneyLogList.vue @@ -4,6 +4,38 @@
+ + + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + +
@@ -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 } } diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue index c3f3097..6a6dccc 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue/modules/CommonMoneyLogForm.vue @@ -4,33 +4,43 @@ - - + + - - + + - - + + - + - + - + + + + + + + + + + + diff --git a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts index 78ef2f6..eb5b1af 100644 --- a/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts +++ b/module-common/src/main/java/org/jeecg/modules/commonMoneyLog/vue3/CommonMoneyLog.data.ts @@ -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', }, ]; diff --git a/module-system/module-system.iml b/module-system/module-system.iml index f8b8e24..f6b27cb 100644 --- a/module-system/module-system.iml +++ b/module-system/module-system.iml @@ -301,6 +301,7 @@ + @@ -335,7 +336,6 @@ - diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml index cdc2bb2..0a3043b 100644 --- a/module-system/src/main/resources/application-dev.yml +++ b/module-system/src/main/resources/application-dev.yml @@ -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: