From f3de68dfae0e76355a03c35d817f40f489ac8e65 Mon Sep 17 00:00:00 2001 From: Administrator <513693417@qq.com> Date: Wed, 23 Sep 2020 22:10:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/ajax/AjaxMemberController.java | 29 ++- .../business/ajax/AjaxOrderController.java | 9 +- .../business/ajax/AjaxProductController.java | 4 +- .../controller/BizCashInfoController.java | 91 +++++++++ .../ruoyi/business/domain/BizCashInfo.java | 183 ++++++++++++++++++ .../business/mapper/BizCashInfoMapper.java | 61 ++++++ .../business/service/IBizCashInfoService.java | 61 ++++++ .../service/impl/BizCashInfoServiceImpl.java | 97 ++++++++++ .../mapper/business/BizCashInfoMapper.xml | 112 +++++++++++ .../templates/business/cash/cash.html | 162 ++++++++++++++++ .../business/member/accountDetail.html | 2 +- .../templates/business/product/add.html | 2 +- .../templates/business/product/edit.html | 2 +- .../templates/business/product/product.html | 4 +- .../templates/business/reward/reward.html | 2 +- .../com/ruoyi/common/utils/DateUtils.java | 9 +- sql/biz.sql | 7 + sql/menu/cashMenu.sql | 22 +++ 18 files changed, 844 insertions(+), 15 deletions(-) create mode 100644 ruoyi-business/src/main/java/com/ruoyi/business/controller/BizCashInfoController.java create mode 100644 ruoyi-business/src/main/java/com/ruoyi/business/domain/BizCashInfo.java create mode 100644 ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizCashInfoMapper.java create mode 100644 ruoyi-business/src/main/java/com/ruoyi/business/service/IBizCashInfoService.java create mode 100644 ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizCashInfoServiceImpl.java create mode 100644 ruoyi-business/src/main/resources/mapper/business/BizCashInfoMapper.xml create mode 100644 ruoyi-business/src/main/resources/templates/business/cash/cash.html create mode 100644 sql/menu/cashMenu.sql diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxMemberController.java b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxMemberController.java index fb6ccefd0..64f764a4d 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxMemberController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxMemberController.java @@ -1,5 +1,6 @@ package com.ruoyi.business.ajax; +import com.ruoyi.business.domain.BizCashInfo; import com.ruoyi.business.domain.BizMember; import com.ruoyi.business.domain.BizMemberAddress; import com.ruoyi.business.service.IBizMemberAddressService; @@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.HashMap; import java.util.Map; @@ -19,10 +21,10 @@ import java.util.Map; @RequestMapping("/ajax/member") public class AjaxMemberController extends AuthController { - @Autowired + @Resource private IBizMemberService bizMemberService; - @Autowired + @Resource private IBizMemberAddressService bizMemberAddressService; //个人中心 @@ -88,4 +90,27 @@ public class AjaxMemberController extends AuthController { } return AjaxResult.success(bizMemberAddressService.deleteBizMemberAddressById(addressID)); } + + //提现信息 + @PostMapping("/getCashInfo") + public AjaxResult getCashInfo(int type) + { + return null; + } + + //提现申请 + @PostMapping("/addCashInfo") + public AjaxResult addCashInfo(BizCashInfo bizCashInfo) + { + + return null; + } + + //我的提现信息列表 + @PostMapping("/listCashInfo") + public AjaxResult listCashInfo() + { + + return null; + } } diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxOrderController.java b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxOrderController.java index c5c200c9b..0d900fdd9 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxOrderController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxOrderController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.HashMap; import java.util.Map; @@ -17,16 +18,16 @@ import java.util.Map; @RequestMapping("/ajax/order") public class AjaxOrderController extends AuthController { - @Autowired + @Resource private IBizOrderService bizOrderService; - @Autowired + @Resource private IBizProductService bizProductService; - @Autowired + @Resource private IBizMemberService bizMemberService; - @Autowired + @Resource private IBizMemberAddressService bizMemberAddressService; diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxProductController.java b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxProductController.java index b2376ca1d..001ea5004 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxProductController.java +++ b/ruoyi-business/src/main/java/com/ruoyi/business/ajax/AjaxProductController.java @@ -26,10 +26,10 @@ import java.util.*; @RequestMapping("/ajax/product") public class AjaxProductController extends AuthController { - @Autowired + @Resource private IBizProductService bizProductService; - @Autowired + @Resource private IBizProductTypeService bizProductTypeService; //分类和推荐商品 diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizCashInfoController.java b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizCashInfoController.java new file mode 100644 index 000000000..958b5afd2 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizCashInfoController.java @@ -0,0 +1,91 @@ +package com.ruoyi.business.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.business.domain.BizCashInfo; +import com.ruoyi.business.service.IBizCashInfoService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +import javax.annotation.Resource; + +/** + * 兑现申请记录Controller + * + * @author ruoyi + * @date 2020-09-23 + */ +@Controller +@RequestMapping("/business/cash") +public class BizCashInfoController extends BaseController +{ + private String prefix = "business/cash"; + + @Resource + private IBizCashInfoService bizCashInfoService; + + @RequiresPermissions("business:cash:view") + @GetMapping() + public String cash() + { + return prefix + "/cash"; + } + + /** + * 查询兑现申请记录列表 + */ + @RequiresPermissions("business:cash:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BizCashInfo bizCashInfo) + { + startPage(); + List list = bizCashInfoService.selectBizCashInfoList(bizCashInfo); + return getDataTable(list); + } + + /** + * 导出兑现申请记录列表 + */ + @RequiresPermissions("business:cash:export") + @Log(title = "兑现申请记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BizCashInfo bizCashInfo) + { + List list = bizCashInfoService.selectBizCashInfoList(bizCashInfo); + ExcelUtil util = new ExcelUtil(BizCashInfo.class); + return util.exportExcel(list, "cash"); + } + + /** + * 批准兑现申请记录 + */ + @RequiresPermissions("business:cash:edit") + @Log(title = "兑现申请记录", businessType = BusinessType.UPDATE) + @PostMapping("/agree") + @ResponseBody + public AjaxResult agreeInfo(Long cashInfoID) + { + BizCashInfo cashInfo = bizCashInfoService.selectBizCashInfoById(cashInfoID); + if (cashInfo.getStatus() == BizCashInfo.CASH_INFO_STATUS_INITIAL) { + cashInfo.setStatus(BizCashInfo.CASH_INFO_STATUS_AGREE); + bizCashInfoService.updateBizCashInfo(cashInfo); + } + return AjaxResult.success(); + } + + +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizCashInfo.java b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizCashInfo.java new file mode 100644 index 000000000..c04c889f6 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/domain/BizCashInfo.java @@ -0,0 +1,183 @@ +package com.ruoyi.business.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 兑现申请记录对象 biz_cash_info + * + * @author ruoyi + * @date 2020-09-23 + */ +public class BizCashInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + //提现申请状态 + public static final int CASH_INFO_STATUS_INITIAL = 0; + public static final int CASH_INFO_STATUS_AGREE = 1; + public static final int CASH_INFO_STATUS_DENY = 2; + + /** 兑现申请ID */ + private Long id; + + /** 会员ID */ + private Long memberId; + + /** 会员姓名 */ + @Excel(name = "会员姓名") + private String memberName; + + /** 会员账户ID */ + private Long accountId; + + /** 账户类型 */ + @Excel(name = "账户类型") + private Integer accountType; + + /** 开户银行 */ + @Excel(name = "开户银行") + private Integer bankId; + + /** 开户人 */ + @Excel(name = "开户人") + private String bankUser; + + /** 开户地 */ + @Excel(name = "开户地") + private String bankCity; + + /** 卡号 */ + @Excel(name = "卡号") + private String bankCard; + + /** 提现金额 */ + @Excel(name = "提现金额") + private Integer drawMoney; + + /** 0-默认 1-通过 2-驳回 */ + @Excel(name = "0-默认 1-通过 2-驳回") + private Integer status; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMemberId(Long memberId) + { + this.memberId = memberId; + } + + public Long getMemberId() + { + return memberId; + } + + public String getMemberName() { + return memberName; + } + + public void setMemberName(String memberName) { + this.memberName = memberName; + } + + public void setAccountId(Long accountId) + { + this.accountId = accountId; + } + + public Long getAccountId() + { + return accountId; + } + public void setAccountType(Integer accountType) + { + this.accountType = accountType; + } + + public Integer getAccountType() + { + return accountType; + } + public void setBankId(Integer bankId) + { + this.bankId = bankId; + } + + public Integer getBankId() + { + return bankId; + } + public void setBankUser(String bankUser) + { + this.bankUser = bankUser; + } + + public String getBankUser() + { + return bankUser; + } + public void setBankCity(String bankCity) + { + this.bankCity = bankCity; + } + + public String getBankCity() + { + return bankCity; + } + public void setBankCard(String bankCard) + { + this.bankCard = bankCard; + } + + public String getBankCard() + { + return bankCard; + } + public void setDrawMoney(Integer drawMoney) + { + this.drawMoney = drawMoney; + } + + public Integer getDrawMoney() + { + return drawMoney; + } + public void setStatus(Integer status) + { + this.status = status; + } + + public Integer getStatus() + { + return status; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("memberId", getMemberId()) + .append("accountId", getAccountId()) + .append("accountType", getAccountType()) + .append("bankId", getBankId()) + .append("bankUser", getBankUser()) + .append("bankCity", getBankCity()) + .append("bankCard", getBankCard()) + .append("drawMoney", getDrawMoney()) + .append("status", getStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizCashInfoMapper.java b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizCashInfoMapper.java new file mode 100644 index 000000000..da8734c09 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/mapper/BizCashInfoMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.business.mapper; + +import java.util.List; +import com.ruoyi.business.domain.BizCashInfo; + +/** + * 兑现申请记录Mapper接口 + * + * @author ruoyi + * @date 2020-09-23 + */ +public interface BizCashInfoMapper +{ + /** + * 查询兑现申请记录 + * + * @param id 兑现申请记录ID + * @return 兑现申请记录 + */ + public BizCashInfo selectBizCashInfoById(Long id); + + /** + * 查询兑现申请记录列表 + * + * @param bizCashInfo 兑现申请记录 + * @return 兑现申请记录集合 + */ + public List selectBizCashInfoList(BizCashInfo bizCashInfo); + + /** + * 新增兑现申请记录 + * + * @param bizCashInfo 兑现申请记录 + * @return 结果 + */ + public int insertBizCashInfo(BizCashInfo bizCashInfo); + + /** + * 修改兑现申请记录 + * + * @param bizCashInfo 兑现申请记录 + * @return 结果 + */ + public int updateBizCashInfo(BizCashInfo bizCashInfo); + + /** + * 删除兑现申请记录 + * + * @param id 兑现申请记录ID + * @return 结果 + */ + public int deleteBizCashInfoById(Long id); + + /** + * 批量删除兑现申请记录 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBizCashInfoByIds(String[] ids); +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizCashInfoService.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizCashInfoService.java new file mode 100644 index 000000000..82ce7b4a3 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizCashInfoService.java @@ -0,0 +1,61 @@ +package com.ruoyi.business.service; + +import java.util.List; +import com.ruoyi.business.domain.BizCashInfo; + +/** + * 兑现申请记录Service接口 + * + * @author ruoyi + * @date 2020-09-23 + */ +public interface IBizCashInfoService +{ + /** + * 查询兑现申请记录 + * + * @param id 兑现申请记录ID + * @return 兑现申请记录 + */ + public BizCashInfo selectBizCashInfoById(Long id); + + /** + * 查询兑现申请记录列表 + * + * @param bizCashInfo 兑现申请记录 + * @return 兑现申请记录集合 + */ + public List selectBizCashInfoList(BizCashInfo bizCashInfo); + + /** + * 新增兑现申请记录 + * + * @param bizCashInfo 兑现申请记录 + * @return 结果 + */ + public int insertBizCashInfo(BizCashInfo bizCashInfo); + + /** + * 修改兑现申请记录 + * + * @param bizCashInfo 兑现申请记录 + * @return 结果 + */ + public int updateBizCashInfo(BizCashInfo bizCashInfo); + + /** + * 批量删除兑现申请记录 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBizCashInfoByIds(String ids); + + /** + * 删除兑现申请记录信息 + * + * @param id 兑现申请记录ID + * @return 结果 + */ + public int deleteBizCashInfoById(Long id); +} diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizCashInfoServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizCashInfoServiceImpl.java new file mode 100644 index 000000000..063828d99 --- /dev/null +++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizCashInfoServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.business.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.business.mapper.BizCashInfoMapper; +import com.ruoyi.business.domain.BizCashInfo; +import com.ruoyi.business.service.IBizCashInfoService; +import com.ruoyi.common.core.text.Convert; + +/** + * 兑现申请记录Service业务层处理 + * + * @author ruoyi + * @date 2020-09-23 + */ +@Service +public class BizCashInfoServiceImpl implements IBizCashInfoService +{ + @Autowired + private BizCashInfoMapper bizCashInfoMapper; + + /** + * 查询兑现申请记录 + * + * @param id 兑现申请记录ID + * @return 兑现申请记录 + */ + @Override + public BizCashInfo selectBizCashInfoById(Long id) + { + return bizCashInfoMapper.selectBizCashInfoById(id); + } + + /** + * 查询兑现申请记录列表 + * + * @param bizCashInfo 兑现申请记录 + * @return 兑现申请记录 + */ + @Override + public List selectBizCashInfoList(BizCashInfo bizCashInfo) + { + return bizCashInfoMapper.selectBizCashInfoList(bizCashInfo); + } + + /** + * 新增兑现申请记录 + * + * @param bizCashInfo 兑现申请记录 + * @return 结果 + */ + @Override + public int insertBizCashInfo(BizCashInfo bizCashInfo) + { + bizCashInfo.setCreateTime(DateUtils.getNowDate()); + return bizCashInfoMapper.insertBizCashInfo(bizCashInfo); + } + + /** + * 修改兑现申请记录 + * + * @param bizCashInfo 兑现申请记录 + * @return 结果 + */ + @Override + public int updateBizCashInfo(BizCashInfo bizCashInfo) + { + bizCashInfo.setUpdateTime(DateUtils.getNowDate()); + return bizCashInfoMapper.updateBizCashInfo(bizCashInfo); + } + + /** + * 删除兑现申请记录对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteBizCashInfoByIds(String ids) + { + return bizCashInfoMapper.deleteBizCashInfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除兑现申请记录信息 + * + * @param id 兑现申请记录ID + * @return 结果 + */ + @Override + public int deleteBizCashInfoById(Long id) + { + return bizCashInfoMapper.deleteBizCashInfoById(id); + } +} diff --git a/ruoyi-business/src/main/resources/mapper/business/BizCashInfoMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizCashInfoMapper.xml new file mode 100644 index 000000000..08d44d9e2 --- /dev/null +++ b/ruoyi-business/src/main/resources/mapper/business/BizCashInfoMapper.xml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + select a.id, a.member_id, (concat(b.member_name, b.mobile)) memberName, account_id, account_type, bank_id, bank_user, bank_city, bank_card, draw_money, status, a.create_by, a.create_time, a.update_by, a.update_time from biz_cash_info a + left join biz_member b on a.member_id = b.id + + + + + + + + insert into biz_cash_info + + member_id, + account_id, + account_type, + bank_id, + bank_user, + bank_city, + bank_card, + draw_money, + status, + create_by, + create_time, + update_by, + update_time, + + + #{memberId}, + #{accountId}, + #{accountType}, + #{bankId}, + #{bankUser}, + #{bankCity}, + #{bankCard}, + #{drawMoney}, + #{status}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update biz_cash_info + + member_id = #{memberId}, + account_id = #{accountId}, + account_type = #{accountType}, + bank_id = #{bankId}, + bank_user = #{bankUser}, + bank_city = #{bankCity}, + bank_card = #{bankCard}, + draw_money = #{drawMoney}, + status = #{status}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from biz_cash_info where id = #{id} + + + + delete from biz_cash_info where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-business/src/main/resources/templates/business/cash/cash.html b/ruoyi-business/src/main/resources/templates/business/cash/cash.html new file mode 100644 index 000000000..becc3680e --- /dev/null +++ b/ruoyi-business/src/main/resources/templates/business/cash/cash.html @@ -0,0 +1,162 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-business/src/main/resources/templates/business/member/accountDetail.html b/ruoyi-business/src/main/resources/templates/business/member/accountDetail.html index f5414c8c5..351aa4ddf 100644 --- a/ruoyi-business/src/main/resources/templates/business/member/accountDetail.html +++ b/ruoyi-business/src/main/resources/templates/business/member/accountDetail.html @@ -11,7 +11,7 @@
  • -
diff --git a/ruoyi-business/src/main/resources/templates/business/product/edit.html b/ruoyi-business/src/main/resources/templates/business/product/edit.html index 60417d379..1f641d540 100644 --- a/ruoyi-business/src/main/resources/templates/business/product/edit.html +++ b/ruoyi-business/src/main/resources/templates/business/product/edit.html @@ -37,7 +37,7 @@
diff --git a/ruoyi-business/src/main/resources/templates/business/product/product.html b/ruoyi-business/src/main/resources/templates/business/product/product.html index 9ddd9d78c..72f181f82 100644 --- a/ruoyi-business/src/main/resources/templates/business/product/product.html +++ b/ruoyi-business/src/main/resources/templates/business/product/product.html @@ -18,12 +18,12 @@
  • - diff --git a/ruoyi-business/src/main/resources/templates/business/reward/reward.html b/ruoyi-business/src/main/resources/templates/business/reward/reward.html index ce0cd93bd..d5cdf11a3 100644 --- a/ruoyi-business/src/main/resources/templates/business/reward/reward.html +++ b/ruoyi-business/src/main/resources/templates/business/reward/reward.html @@ -69,7 +69,7 @@ }, { field: 'rewardDate', - title: '奖励日期', + title: '结算日期', align: 'center' }, { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java index 41ca603e8..de70daced 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java @@ -77,7 +77,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils public static final String getMilliTime() { - return dateTimeNow(YYYY_MM_DD_HH_MM_SS_SSS); + return dateTimeNow(YYYY_MM_DD_HH_MM_SS_SSS) + getRandomNumber(6); + } + + //随机N位数字 + public static final String getRandomNumber(int size) + { + String rand = String.valueOf(Math.random()); + return rand.substring(2, 2 + size); } public static final String dateTimeNow() diff --git a/sql/biz.sql b/sql/biz.sql index a31604075..f6f5f820f 100644 --- a/sql/biz.sql +++ b/sql/biz.sql @@ -92,6 +92,13 @@ CREATE TABLE `biz_cash_info` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '兑现申请ID', `member_id` bigint(20) NOT NULL COMMENT '会员ID', `account_id` bigint(20) NOT NULL COMMENT '会员账户ID', + `account_type` tinyint(1) NOT NULL COMMENT '会员账户类型', + `bank_id` tinyint(1) DEFAULT 0 NOT NULL COMMENT '银行ID', + `bank_user` varchar(20) DEFAULT '' NOT NULL COMMENT '银行开户人', + `bank_city` varchar(64) DEFAULT '' NOT NULL COMMENT '银行开户地点', + `bank_card` varchar(30) DEFAULT '' NOT NULL COMMENT '银行卡号', + `draw_money` bigint(8) NOT NULL COMMENT '提现金额', + `status` tinyint(1) DEFAULT 0 NOT NULL COMMENT '提现状态', `create_by` varchar(64) DEFAULT '' COMMENT '创建者', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_by` varchar(64) DEFAULT '' COMMENT '更新者', diff --git a/sql/menu/cashMenu.sql b/sql/menu/cashMenu.sql new file mode 100644 index 000000000..fd59f6eb5 --- /dev/null +++ b/sql/menu/cashMenu.sql @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, target, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('提现管理', 'menuItem', '0', '7', '/business/cash', 'C', '0', 'business:cash:view', 'fa fa-child', 'admin', '2018-03-01', 'ry', '2018-03-01', '提现菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('兑现申请记录查询', @parentId, '1', '#', 'F', '0', 'business:cash:list', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('兑现申请记录新增', @parentId, '2', '#', 'F', '0', 'business:cash:add', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('兑现申请记录修改', @parentId, '3', '#', 'F', '0', 'business:cash:edit', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('兑现申请记录删除', @parentId, '4', '#', 'F', '0', 'business:cash:remove', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', ''); + +insert into sys_menu (menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values('兑现申请记录导出', @parentId, '5', '#', 'F', '0', 'business:cash:export', '#', 'admin', '2018-03-01', 'ry', '2018-03-01', '');