From 3f03e309daa8f4a8e0399900e298337c526d2901 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 1 Apr 2022 18:12:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=98=E6=9B=B4=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9A=84=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/启动6379redis.bat.lnk | Bin 0 -> 1313 bytes bin/启动nacos-server-2.0.4.bat | 2 + ruoyi-modules/pom.xml | 1 + ruoyi-modules/ruoyi-xjt/pom.xml | 99 +++ .../com/ruoyi/xjt/RuoYiXjtApplication.java | 34 + .../xjt/controller/TMoneyController.java | 105 +++ .../xjt/controller/TOrderController.java | 105 +++ .../xjt/controller/XjtUserController.java | 38 ++ .../java/com/ruoyi/xjt/domain/TMoney.java | 181 ++++++ .../java/com/ruoyi/xjt/domain/TOrder.java | 394 ++++++++++++ .../com/ruoyi/xjt/mapper/TMoneyMapper.java | 61 ++ .../com/ruoyi/xjt/mapper/TOrderMapper.java | 61 ++ .../com/ruoyi/xjt/service/ITMoneyService.java | 61 ++ .../com/ruoyi/xjt/service/ITOrderService.java | 61 ++ .../com/ruoyi/xjt/service/XjtUserService.java | 41 ++ .../XjtUserServiceFallbackFactory.java | 32 + .../xjt/service/impl/TMoneyServiceImpl.java | 93 +++ .../xjt/service/impl/TOrderServiceImpl.java | 93 +++ .../ruoyi-xjt/src/main/resources/banner.txt | 10 + .../src/main/resources/bootstrap.yml | 25 + .../ruoyi-xjt/src/main/resources/logback.xml | 74 +++ .../resources/mapper/xjt/TMoneyMapper.xml | 101 +++ .../resources/mapper/xjt/TOrderMapper.xml | 176 +++++ ruoyi-ui/src/api/xjt/money.js | 44 ++ ruoyi-ui/src/api/xjt/order.js | 44 ++ ruoyi-ui/src/views/xjt/money/index.vue | 365 +++++++++++ ruoyi-ui/src/views/xjt/order/index.vue | 608 ++++++++++++++++++ 27 files changed, 2909 insertions(+) create mode 100644 bin/启动6379redis.bat.lnk create mode 100644 bin/启动nacos-server-2.0.4.bat create mode 100644 ruoyi-modules/ruoyi-xjt/pom.xml create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/RuoYiXjtApplication.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/TMoneyController.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/TOrderController.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/XjtUserController.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/domain/TMoney.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/domain/TOrder.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/mapper/TMoneyMapper.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/mapper/TOrderMapper.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/ITMoneyService.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/ITOrderService.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/XjtUserService.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/factory/XjtUserServiceFallbackFactory.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/impl/TMoneyServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/impl/TOrderServiceImpl.java create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/resources/banner.txt create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/resources/bootstrap.yml create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/resources/logback.xml create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/resources/mapper/xjt/TMoneyMapper.xml create mode 100644 ruoyi-modules/ruoyi-xjt/src/main/resources/mapper/xjt/TOrderMapper.xml create mode 100644 ruoyi-ui/src/api/xjt/money.js create mode 100644 ruoyi-ui/src/api/xjt/order.js create mode 100644 ruoyi-ui/src/views/xjt/money/index.vue create mode 100644 ruoyi-ui/src/views/xjt/order/index.vue diff --git a/bin/启动6379redis.bat.lnk b/bin/启动6379redis.bat.lnk new file mode 100644 index 0000000000000000000000000000000000000000..1bee4d528eec807b0eeac8365078866ead3ed5f0 GIT binary patch literal 1313 zcmbVMUr3Wt6#p&7RHP=ElxQ1PV2az!ayYWAhMPKd%+IX&9(1{Krdv46dTIS71j~o$ zMKHwF85pw%HHpH9=%p9yAuNK5A|Xw&r2kaseEX)KLKvO#yXV~do%=iIo^$VP08|Mp zXaq*35d~Kf4K3N4iRq6o&Eu-JxEV>~PW+=Gn(qtwK_%<3np7n~V}DgPrhRX6tGmXd zkzp`&tcTug62m?UZAX?g(+jB@HJZHMdLMQm29cP#KT%M$%`bej>d51*6lbMkC!0To zD`u}go)M#|oxEHcJVGA1cf^ipTm(|W}F$ASJ(rbyyg&Mf!><(hPh=im$%PN9Pn)f5fbL~s(430z0kTL~=HghT>oo;G#Eq$VBe zE!_gi5V7o5S8>x;IPyg`T^wl0KKrKq-Q$6&_zU9$=YO^6^vivp zq61TBI^D#bRcWvjJF`^Q6VVG2n`XyibK z+0DZy!Qbcw*Uu196qZo&Q_c){@U^0`hri^M2yD&5Ln7XCwTuGs%|j z1yipgRMIu}(6PMK03WnC<%~QK)pW`AxiqwqeL}SIUj)xD5;*bRx=}grX|uTOaXA9$0*8{go!DT$b@`YzV9nQc=bdcj&eXDlmGJxA1AZhV L15w9A#{BpPBV!DK literal 0 HcmV?d00001 diff --git a/bin/启动nacos-server-2.0.4.bat b/bin/启动nacos-server-2.0.4.bat new file mode 100644 index 00000000..6d0ee16b --- /dev/null +++ b/bin/启动nacos-server-2.0.4.bat @@ -0,0 +1,2 @@ +@Echo Off +start D:\tools_2022\work\nacos-server-2.0.4\nacos\bin\startup.cmd -m standalone diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 83871150..00db4cf1 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -13,6 +13,7 @@ ruoyi-gen ruoyi-job ruoyi-file + ruoyi-xjt ruoyi-modules diff --git a/ruoyi-modules/ruoyi-xjt/pom.xml b/ruoyi-modules/ruoyi-xjt/pom.xml new file mode 100644 index 00000000..347c7232 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/pom.xml @@ -0,0 +1,99 @@ + + + + ruoyi + com.ruoyi + 3.4.0 + + 4.0.0 + + ruoyi-modules-xjt + + ruoyi-modules-xjt系统模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + mysql + mysql-connector-java + + + + + com.ruoyi + ruoyi-common-datasource + + + + + com.ruoyi + ruoyi-common-datascope + + + + + com.ruoyi + ruoyi-common-log + + + + + com.ruoyi + ruoyi-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/RuoYiXjtApplication.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/RuoYiXjtApplication.java new file mode 100644 index 00000000..1d37529a --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/RuoYiXjtApplication.java @@ -0,0 +1,34 @@ +package com.ruoyi.xjt; + +import com.ruoyi.common.security.annotation.EnableCustomConfig; +import com.ruoyi.common.security.annotation.EnableRyFeignClients; +import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author ruoyi + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class RuoYiXjtApplication +{ + public static void main(String[] args) + { + SpringApplication.run(RuoYiXjtApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + " .-------. ____ __ \n" + + " | _ _ \\ \\ \\ / / \n" + + " | ( ' ) | \\ _. / ' \n" + + " |(_ o _) / _( )_ .' \n" + + " | (_,_).' __ ___(_ o _)' \n" + + " | |\\ \\ | || |(_,_)' \n" + + " | | \\ `' /| `-' / \n" + + " | | \\ / \\ / \n" + + " ''-' `'-' `-..-' "); + } +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/TMoneyController.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/TMoneyController.java new file mode 100644 index 00000000..7835a075 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/TMoneyController.java @@ -0,0 +1,105 @@ +package com.ruoyi.xjt.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.xjt.domain.TMoney; +import com.ruoyi.xjt.service.ITMoneyService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 支出或收入详情Controller + * + * @author ruoyi + * @date 2022-04-01 + */ +@RestController +@RequestMapping("/money") +public class TMoneyController extends BaseController +{ + @Autowired + private ITMoneyService tMoneyService; + + /** + * 查询支出或收入详情列表 + */ + @RequiresPermissions("xjt:money:list") + @GetMapping("/list") + public TableDataInfo list(TMoney tMoney) + { + startPage(); + List list = tMoneyService.selectTMoneyList(tMoney); + return getDataTable(list); + } + + /** + * 导出支出或收入详情列表 + */ + @RequiresPermissions("xjt:money:export") + @Log(title = "支出或收入详情", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, TMoney tMoney) + { + List list = tMoneyService.selectTMoneyList(tMoney); + ExcelUtil util = new ExcelUtil(TMoney.class); + util.exportExcel(response, list, "支出或收入详情数据"); + } + + /** + * 获取支出或收入详情详细信息 + */ + @RequiresPermissions("xjt:money:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(tMoneyService.selectTMoneyById(id)); + } + + /** + * 新增支出或收入详情 + */ + @RequiresPermissions("xjt:money:add") + @Log(title = "支出或收入详情", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TMoney tMoney) + { + return toAjax(tMoneyService.insertTMoney(tMoney)); + } + + /** + * 修改支出或收入详情 + */ + @RequiresPermissions("xjt:money:edit") + @Log(title = "支出或收入详情", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TMoney tMoney) + { + return toAjax(tMoneyService.updateTMoney(tMoney)); + } + + /** + * 删除支出或收入详情 + */ + @RequiresPermissions("xjt:money:remove") + @Log(title = "支出或收入详情", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(tMoneyService.deleteTMoneyByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/TOrderController.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/TOrderController.java new file mode 100644 index 00000000..9e32d143 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/TOrderController.java @@ -0,0 +1,105 @@ +package com.ruoyi.xjt.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.xjt.domain.TOrder; +import com.ruoyi.xjt.service.ITOrderService; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.page.TableDataInfo; + +/** + * 缴费订单Controller + * + * @author ruoyi + * @date 2022-04-01 + */ +@RestController +@RequestMapping("/order") +public class TOrderController extends BaseController +{ + @Autowired + private ITOrderService tOrderService; + + /** + * 查询缴费订单列表 + */ + @RequiresPermissions("xjt:order:list") + @GetMapping("/list") + public TableDataInfo list(TOrder tOrder) + { + startPage(); + List list = tOrderService.selectTOrderList(tOrder); + return getDataTable(list); + } + + /** + * 导出缴费订单列表 + */ + @RequiresPermissions("xjt:order:export") + @Log(title = "缴费订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, TOrder tOrder) + { + List list = tOrderService.selectTOrderList(tOrder); + ExcelUtil util = new ExcelUtil(TOrder.class); + util.exportExcel(response, list, "缴费订单数据"); + } + + /** + * 获取缴费订单详细信息 + */ + @RequiresPermissions("xjt:order:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(tOrderService.selectTOrderById(id)); + } + + /** + * 新增缴费订单 + */ + @RequiresPermissions("xjt:order:add") + @Log(title = "缴费订单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TOrder tOrder) + { + return toAjax(tOrderService.insertTOrder(tOrder)); + } + + /** + * 修改缴费订单 + */ + @RequiresPermissions("xjt:order:edit") + @Log(title = "缴费订单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TOrder tOrder) + { + return toAjax(tOrderService.updateTOrder(tOrder)); + } + + /** + * 删除缴费订单 + */ + @RequiresPermissions("xjt:order:remove") + @Log(title = "缴费订单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(tOrderService.deleteTOrderByIds(ids)); + } +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/XjtUserController.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/XjtUserController.java new file mode 100644 index 00000000..b8b96f7f --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/XjtUserController.java @@ -0,0 +1,38 @@ +package com.ruoyi.xjt.controller; + +import com.alibaba.fastjson.JSON; +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.system.api.model.LoginUser; +import com.ruoyi.xjt.service.XjtUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@RestController +@RequestMapping("/user") +public class XjtUserController { + @Autowired + private XjtUserService xjtUserService; + /** + * 根据角色编号获取详细信息 + */ + @RequiresPermissions("system:role:query") + @GetMapping(value = "/{username}") + public AjaxResult getInfo(@PathVariable String username) + { + System.out.println("用户username:"+username); + R> userinfo= xjtUserService.getUserInfo(username, SecurityConstants.INNER); + System.out.println("用户信息:"+JSON.toJSONString(userinfo)); + LoginUser loginuser = SecurityUtils.getLoginUser(); + System.out.println("登录用户信息"+JSON.toJSONString(loginuser)); + return AjaxResult.success(userinfo); + } +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/domain/TMoney.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/domain/TMoney.java new file mode 100644 index 00000000..aa81419a --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/domain/TMoney.java @@ -0,0 +1,181 @@ +package com.ruoyi.xjt.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 支出或收入详情对象 t_money + * + * @author ruoyi + * @date 2022-04-01 + */ +public class TMoney extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 对应用户 */ + @Excel(name = "对应用户") + private Long userid; + + /** 金额 */ + @Excel(name = "金额") + private BigDecimal money; + + /** 交易类型 2：保养 4:进货 7：救援 10：维修厂营销卡 40：后台操作 50:提现 60：牛牛币返利 70：商城服务单 80:聚乐贝兑换 0：充值 */ + @Excel(name = "交易类型 2：保养 4:进货 7：救援 10：维修厂营销卡 40：后台操作 50:提现 60：牛牛币返利 70：商城服务单 80:聚乐贝兑换 0：充值") + private Long tradetype; + + /** 交易时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "交易时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date tradedate; + + /** 获取与扣除1=获取，2=扣除 */ + @Excel(name = "获取与扣除1=获取，2=扣除 ") + private Long type; + + /** 备注 */ + @Excel(name = "备注") + private String note; + + /** 处理后剩余金额 */ + @Excel(name = "处理后剩余金额") + private BigDecimal leftmoney; + + /** 订单id */ + @Excel(name = "订单id") + private Long orderid; + + /** 状态1=正常，2=删除 */ + @Excel(name = "状态1=正常，2=删除") + private Long state; + + /** bbsmall t_orderid表 id */ + @Excel(name = "bbsmall t_orderid表 id") + private Long bbsmallorderid; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setUserid(Long userid) + { + this.userid = userid; + } + + public Long getUserid() + { + return userid; + } + public void setMoney(BigDecimal money) + { + this.money = money; + } + + public BigDecimal getMoney() + { + return money; + } + public void setTradetype(Long tradetype) + { + this.tradetype = tradetype; + } + + public Long getTradetype() + { + return tradetype; + } + public void setTradedate(Date tradedate) + { + this.tradedate = tradedate; + } + + public Date getTradedate() + { + return tradedate; + } + public void setType(Long type) + { + this.type = type; + } + + public Long getType() + { + return type; + } + public void setNote(String note) + { + this.note = note; + } + + public String getNote() + { + return note; + } + public void setLeftmoney(BigDecimal leftmoney) + { + this.leftmoney = leftmoney; + } + + public BigDecimal getLeftmoney() + { + return leftmoney; + } + public void setOrderid(Long orderid) + { + this.orderid = orderid; + } + + public Long getOrderid() + { + return orderid; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setBbsmallorderid(Long bbsmallorderid) + { + this.bbsmallorderid = bbsmallorderid; + } + + public Long getBbsmallorderid() + { + return bbsmallorderid; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("userid", getUserid()) + .append("money", getMoney()) + .append("tradetype", getTradetype()) + .append("tradedate", getTradedate()) + .append("type", getType()) + .append("note", getNote()) + .append("leftmoney", getLeftmoney()) + .append("orderid", getOrderid()) + .append("state", getState()) + .append("bbsmallorderid", getBbsmallorderid()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/domain/TOrder.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/domain/TOrder.java new file mode 100644 index 00000000..55cef021 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/domain/TOrder.java @@ -0,0 +1,394 @@ +package com.ruoyi.xjt.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; + +/** + * 缴费订单对象 t_order + * + * @author ruoyi + * @date 2022-04-01 + */ +public class TOrder extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 业务发生所属公司 */ + @Excel(name = "业务发生所属公司") + private Long companyid; + + /** 对应用户 */ + @Excel(name = "对应用户") + private Long khuserid; + + /** 服务商用户id（洗车工 或者 维修厂） */ + @Excel(name = "服务商用户id", readConverterExp = "洗=车工,或=者,维=修厂") + private Long fwsuserid; + + /** 订单总额 */ + @Excel(name = "订单总额") + private BigDecimal money; + + /** 其中使用余额支付多少元 */ + @Excel(name = "其中使用余额支付多少元") + private BigDecimal yuepay; + + /** 其中使用保障基金支付多少元 */ + @Excel(name = "其中使用保障基金支付多少元") + private BigDecimal fundpay; + + /** 其中使用微信活支付宝支付多少元 */ + @Excel(name = "其中使用微信活支付宝支付多少元") + private BigDecimal wxorcftpay; + + /** 交易类型（ 2：保养 4：进货 6：基金申请 7：救援 8：维修厂充值巴士币 9: 充值 10：购买维修厂卡片） */ + @Excel(name = "交易类型", readConverterExp = "2=：保养,4=：进货,6=：基金申请,7=：救援,8=：维修厂充值巴士币,9=:,充=值,1=0：购买维修厂卡片") + private Long tradetype; + + /** 订单号 */ + @Excel(name = "订单号") + private String ordernum; + + /** 支付时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date paytime; + + /** 订单时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date createdate; + + /** 支付类型 0=余额支付 1=微信支付，2=支付宝支付 ，3=保障金支付 4：现金支付 10：余额+微信 20：余额+支付宝 13：保障金+微信 23=保障金+支付宝 30: 保障金+余额支付 130：保障金+微信+余额支付 230=保障金+支付宝+余额支付 43：保障基金+现金支付 */ + @Excel(name = "支付类型 0=余额支付 1=微信支付，2=支付宝支付 ，3=保障金支付 4：现金支付 10：余额+微信 20：余额+支付宝 13：保障金+微信 23=保障金+支付宝 30: 保障金+余额支付 130：保障金+微信+余额支付 230=保障金+支付宝+余额支付 43：保障基金+现金支付") + private Long paytype; + + /** 支付状态 0未支付 1已支付 */ + @Excel(name = "支付状态 0未支付 1已支付") + private Long paystate; + + /** 微信或支付宝返回的交易号 */ + @Excel(name = "微信或支付宝返回的交易号") + private String tradeNo; + + /** 商户号 */ + @Excel(name = "商户号") + private String mchId; + + /** 微信或支付宝返回的交易状态 */ + @Excel(name = "微信或支付宝返回的交易状态") + private String tradeStatus; + + /** 优惠价 用户关联表id */ + @Excel(name = "优惠价 用户关联表id") + private Long cuid; + + /** 使用优惠价额度 */ + @Excel(name = "使用优惠价额度") + private BigDecimal cumoney; + + /** 退款审核人id */ + @Excel(name = "退款审核人id") + private Long refundAuditUserid; + + /** 退款金额 */ + @Excel(name = "退款金额") + private BigDecimal refundMoney; + + /** 退款备注 */ + @Excel(name = "退款备注") + private String refundNote; + + /** 退款单号 */ + @Excel(name = "退款单号") + private String refundNo; + + /** 退款状态 1：已成功提交退款申请 2：退款成功 3：退款失败 */ + @Excel(name = "退款状态 1：已成功提交退款申请 2：退款成功 3：退款失败") + private Integer refundState; + + /** 退款时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date refundTime; + + /** 退款微信返回时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "退款微信返回时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date refundSuccesstime; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setCompanyid(Long companyid) + { + this.companyid = companyid; + } + + public Long getCompanyid() + { + return companyid; + } + public void setKhuserid(Long khuserid) + { + this.khuserid = khuserid; + } + + public Long getKhuserid() + { + return khuserid; + } + public void setFwsuserid(Long fwsuserid) + { + this.fwsuserid = fwsuserid; + } + + public Long getFwsuserid() + { + return fwsuserid; + } + public void setMoney(BigDecimal money) + { + this.money = money; + } + + public BigDecimal getMoney() + { + return money; + } + public void setYuepay(BigDecimal yuepay) + { + this.yuepay = yuepay; + } + + public BigDecimal getYuepay() + { + return yuepay; + } + public void setFundpay(BigDecimal fundpay) + { + this.fundpay = fundpay; + } + + public BigDecimal getFundpay() + { + return fundpay; + } + public void setWxorcftpay(BigDecimal wxorcftpay) + { + this.wxorcftpay = wxorcftpay; + } + + public BigDecimal getWxorcftpay() + { + return wxorcftpay; + } + public void setTradetype(Long tradetype) + { + this.tradetype = tradetype; + } + + public Long getTradetype() + { + return tradetype; + } + public void setOrdernum(String ordernum) + { + this.ordernum = ordernum; + } + + public String getOrdernum() + { + return ordernum; + } + public void setPaytime(Date paytime) + { + this.paytime = paytime; + } + + public Date getPaytime() + { + return paytime; + } + public void setCreatedate(Date createdate) + { + this.createdate = createdate; + } + + public Date getCreatedate() + { + return createdate; + } + public void setPaytype(Long paytype) + { + this.paytype = paytype; + } + + public Long getPaytype() + { + return paytype; + } + public void setPaystate(Long paystate) + { + this.paystate = paystate; + } + + public Long getPaystate() + { + return paystate; + } + public void setTradeNo(String tradeNo) + { + this.tradeNo = tradeNo; + } + + public String getTradeNo() + { + return tradeNo; + } + public void setMchId(String mchId) + { + this.mchId = mchId; + } + + public String getMchId() + { + return mchId; + } + public void setTradeStatus(String tradeStatus) + { + this.tradeStatus = tradeStatus; + } + + public String getTradeStatus() + { + return tradeStatus; + } + public void setCuid(Long cuid) + { + this.cuid = cuid; + } + + public Long getCuid() + { + return cuid; + } + public void setCumoney(BigDecimal cumoney) + { + this.cumoney = cumoney; + } + + public BigDecimal getCumoney() + { + return cumoney; + } + public void setRefundAuditUserid(Long refundAuditUserid) + { + this.refundAuditUserid = refundAuditUserid; + } + + public Long getRefundAuditUserid() + { + return refundAuditUserid; + } + public void setRefundMoney(BigDecimal refundMoney) + { + this.refundMoney = refundMoney; + } + + public BigDecimal getRefundMoney() + { + return refundMoney; + } + public void setRefundNote(String refundNote) + { + this.refundNote = refundNote; + } + + public String getRefundNote() + { + return refundNote; + } + public void setRefundNo(String refundNo) + { + this.refundNo = refundNo; + } + + public String getRefundNo() + { + return refundNo; + } + public void setRefundState(Integer refundState) + { + this.refundState = refundState; + } + + public Integer getRefundState() + { + return refundState; + } + public void setRefundTime(Date refundTime) + { + this.refundTime = refundTime; + } + + public Date getRefundTime() + { + return refundTime; + } + public void setRefundSuccesstime(Date refundSuccesstime) + { + this.refundSuccesstime = refundSuccesstime; + } + + public Date getRefundSuccesstime() + { + return refundSuccesstime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("companyid", getCompanyid()) + .append("khuserid", getKhuserid()) + .append("fwsuserid", getFwsuserid()) + .append("money", getMoney()) + .append("yuepay", getYuepay()) + .append("fundpay", getFundpay()) + .append("wxorcftpay", getWxorcftpay()) + .append("tradetype", getTradetype()) + .append("ordernum", getOrdernum()) + .append("paytime", getPaytime()) + .append("createdate", getCreatedate()) + .append("paytype", getPaytype()) + .append("paystate", getPaystate()) + .append("tradeNo", getTradeNo()) + .append("mchId", getMchId()) + .append("tradeStatus", getTradeStatus()) + .append("cuid", getCuid()) + .append("cumoney", getCumoney()) + .append("refundAuditUserid", getRefundAuditUserid()) + .append("refundMoney", getRefundMoney()) + .append("refundNote", getRefundNote()) + .append("refundNo", getRefundNo()) + .append("refundState", getRefundState()) + .append("refundTime", getRefundTime()) + .append("refundSuccesstime", getRefundSuccesstime()) + .toString(); + } +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/mapper/TMoneyMapper.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/mapper/TMoneyMapper.java new file mode 100644 index 00000000..e7f218e6 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/mapper/TMoneyMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.xjt.mapper; + +import java.util.List; +import com.ruoyi.xjt.domain.TMoney; + +/** + * 支出或收入详情Mapper接口 + * + * @author ruoyi + * @date 2022-04-01 + */ +public interface TMoneyMapper +{ + /** + * 查询支出或收入详情 + * + * @param id 支出或收入详情主键 + * @return 支出或收入详情 + */ + public TMoney selectTMoneyById(Long id); + + /** + * 查询支出或收入详情列表 + * + * @param tMoney 支出或收入详情 + * @return 支出或收入详情集合 + */ + public List selectTMoneyList(TMoney tMoney); + + /** + * 新增支出或收入详情 + * + * @param tMoney 支出或收入详情 + * @return 结果 + */ + public int insertTMoney(TMoney tMoney); + + /** + * 修改支出或收入详情 + * + * @param tMoney 支出或收入详情 + * @return 结果 + */ + public int updateTMoney(TMoney tMoney); + + /** + * 删除支出或收入详情 + * + * @param id 支出或收入详情主键 + * @return 结果 + */ + public int deleteTMoneyById(Long id); + + /** + * 批量删除支出或收入详情 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTMoneyByIds(Long[] ids); +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/mapper/TOrderMapper.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/mapper/TOrderMapper.java new file mode 100644 index 00000000..b8f0d182 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/mapper/TOrderMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.xjt.mapper; + +import java.util.List; +import com.ruoyi.xjt.domain.TOrder; + +/** + * 缴费订单Mapper接口 + * + * @author ruoyi + * @date 2022-04-01 + */ +public interface TOrderMapper +{ + /** + * 查询缴费订单 + * + * @param id 缴费订单主键 + * @return 缴费订单 + */ + public TOrder selectTOrderById(Long id); + + /** + * 查询缴费订单列表 + * + * @param tOrder 缴费订单 + * @return 缴费订单集合 + */ + public List selectTOrderList(TOrder tOrder); + + /** + * 新增缴费订单 + * + * @param tOrder 缴费订单 + * @return 结果 + */ + public int insertTOrder(TOrder tOrder); + + /** + * 修改缴费订单 + * + * @param tOrder 缴费订单 + * @return 结果 + */ + public int updateTOrder(TOrder tOrder); + + /** + * 删除缴费订单 + * + * @param id 缴费订单主键 + * @return 结果 + */ + public int deleteTOrderById(Long id); + + /** + * 批量删除缴费订单 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteTOrderByIds(Long[] ids); +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/ITMoneyService.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/ITMoneyService.java new file mode 100644 index 00000000..1aaa976b --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/ITMoneyService.java @@ -0,0 +1,61 @@ +package com.ruoyi.xjt.service; + +import java.util.List; +import com.ruoyi.xjt.domain.TMoney; + +/** + * 支出或收入详情Service接口 + * + * @author ruoyi + * @date 2022-04-01 + */ +public interface ITMoneyService +{ + /** + * 查询支出或收入详情 + * + * @param id 支出或收入详情主键 + * @return 支出或收入详情 + */ + public TMoney selectTMoneyById(Long id); + + /** + * 查询支出或收入详情列表 + * + * @param tMoney 支出或收入详情 + * @return 支出或收入详情集合 + */ + public List selectTMoneyList(TMoney tMoney); + + /** + * 新增支出或收入详情 + * + * @param tMoney 支出或收入详情 + * @return 结果 + */ + public int insertTMoney(TMoney tMoney); + + /** + * 修改支出或收入详情 + * + * @param tMoney 支出或收入详情 + * @return 结果 + */ + public int updateTMoney(TMoney tMoney); + + /** + * 批量删除支出或收入详情 + * + * @param ids 需要删除的支出或收入详情主键集合 + * @return 结果 + */ + public int deleteTMoneyByIds(Long[] ids); + + /** + * 删除支出或收入详情信息 + * + * @param id 支出或收入详情主键 + * @return 结果 + */ + public int deleteTMoneyById(Long id); +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/ITOrderService.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/ITOrderService.java new file mode 100644 index 00000000..bc99a988 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/ITOrderService.java @@ -0,0 +1,61 @@ +package com.ruoyi.xjt.service; + +import java.util.List; +import com.ruoyi.xjt.domain.TOrder; + +/** + * 缴费订单Service接口 + * + * @author ruoyi + * @date 2022-04-01 + */ +public interface ITOrderService +{ + /** + * 查询缴费订单 + * + * @param id 缴费订单主键 + * @return 缴费订单 + */ + public TOrder selectTOrderById(Long id); + + /** + * 查询缴费订单列表 + * + * @param tOrder 缴费订单 + * @return 缴费订单集合 + */ + public List selectTOrderList(TOrder tOrder); + + /** + * 新增缴费订单 + * + * @param tOrder 缴费订单 + * @return 结果 + */ + public int insertTOrder(TOrder tOrder); + + /** + * 修改缴费订单 + * + * @param tOrder 缴费订单 + * @return 结果 + */ + public int updateTOrder(TOrder tOrder); + + /** + * 批量删除缴费订单 + * + * @param ids 需要删除的缴费订单主键集合 + * @return 结果 + */ + public int deleteTOrderByIds(Long[] ids); + + /** + * 删除缴费订单信息 + * + * @param id 缴费订单主键 + * @return 结果 + */ + public int deleteTOrderById(Long id); +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/XjtUserService.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/XjtUserService.java new file mode 100644 index 00000000..979679de --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/XjtUserService.java @@ -0,0 +1,41 @@ +package com.ruoyi.xjt.service; + +import com.ruoyi.common.core.constant.SecurityConstants; +import com.ruoyi.common.core.constant.ServiceNameConstants; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.xjt.service.factory.XjtUserServiceFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * 用户服务 + * + * @author ruoyi + */ +@Service +@FeignClient(contextId = "xjtUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = XjtUserServiceFallbackFactory.class) +public interface XjtUserService +{ + /** + * 通过用户名查询用户信息 + * + * @param username 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/user/info/{username}") + public R> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 注册用户信息 + * + * @param sysUser 用户信息 + * @param source 请求来源 + * @return 结果 + */ + @PostMapping("/user/register") + public R registerUserInfo(@RequestBody Map sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/factory/XjtUserServiceFallbackFactory.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/factory/XjtUserServiceFallbackFactory.java new file mode 100644 index 00000000..03f37592 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/factory/XjtUserServiceFallbackFactory.java @@ -0,0 +1,32 @@ +package com.ruoyi.xjt.service.factory; + +import com.ruoyi.common.core.domain.R; +import com.ruoyi.xjt.service.XjtUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.openfeign.FallbackFactory; +import org.springframework.stereotype.Component; + +import java.util.Map; +@Component +public class XjtUserServiceFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(XjtUserServiceFallbackFactory.class); + @Override + public XjtUserService create(Throwable throwable) { + log.error("用户服务调用失败:{}", throwable.getMessage()); + return new XjtUserService() + { + @Override + public R> getUserInfo(String username, String source) + { + return R.fail("获取用户失败:" + throwable.getMessage()); + } + + @Override + public R registerUserInfo(Map sysUser, String source) + { + return R.fail("注册用户失败:" + throwable.getMessage()); + } + }; + } +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/impl/TMoneyServiceImpl.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/impl/TMoneyServiceImpl.java new file mode 100644 index 00000000..cd56b8ea --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/impl/TMoneyServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.xjt.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.xjt.mapper.TMoneyMapper; +import com.ruoyi.xjt.domain.TMoney; +import com.ruoyi.xjt.service.ITMoneyService; + +/** + * 支出或收入详情Service业务层处理 + * + * @author ruoyi + * @date 2022-04-01 + */ +@Service +public class TMoneyServiceImpl implements ITMoneyService +{ + @Autowired + private TMoneyMapper tMoneyMapper; + + /** + * 查询支出或收入详情 + * + * @param id 支出或收入详情主键 + * @return 支出或收入详情 + */ + @Override + public TMoney selectTMoneyById(Long id) + { + return tMoneyMapper.selectTMoneyById(id); + } + + /** + * 查询支出或收入详情列表 + * + * @param tMoney 支出或收入详情 + * @return 支出或收入详情 + */ + @Override + public List selectTMoneyList(TMoney tMoney) + { + return tMoneyMapper.selectTMoneyList(tMoney); + } + + /** + * 新增支出或收入详情 + * + * @param tMoney 支出或收入详情 + * @return 结果 + */ + @Override + public int insertTMoney(TMoney tMoney) + { + return tMoneyMapper.insertTMoney(tMoney); + } + + /** + * 修改支出或收入详情 + * + * @param tMoney 支出或收入详情 + * @return 结果 + */ + @Override + public int updateTMoney(TMoney tMoney) + { + return tMoneyMapper.updateTMoney(tMoney); + } + + /** + * 批量删除支出或收入详情 + * + * @param ids 需要删除的支出或收入详情主键 + * @return 结果 + */ + @Override + public int deleteTMoneyByIds(Long[] ids) + { + return tMoneyMapper.deleteTMoneyByIds(ids); + } + + /** + * 删除支出或收入详情信息 + * + * @param id 支出或收入详情主键 + * @return 结果 + */ + @Override + public int deleteTMoneyById(Long id) + { + return tMoneyMapper.deleteTMoneyById(id); + } +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/impl/TOrderServiceImpl.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/impl/TOrderServiceImpl.java new file mode 100644 index 00000000..c2a3b9ed --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/service/impl/TOrderServiceImpl.java @@ -0,0 +1,93 @@ +package com.ruoyi.xjt.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.xjt.mapper.TOrderMapper; +import com.ruoyi.xjt.domain.TOrder; +import com.ruoyi.xjt.service.ITOrderService; + +/** + * 缴费订单Service业务层处理 + * + * @author ruoyi + * @date 2022-04-01 + */ +@Service +public class TOrderServiceImpl implements ITOrderService +{ + @Autowired + private TOrderMapper tOrderMapper; + + /** + * 查询缴费订单 + * + * @param id 缴费订单主键 + * @return 缴费订单 + */ + @Override + public TOrder selectTOrderById(Long id) + { + return tOrderMapper.selectTOrderById(id); + } + + /** + * 查询缴费订单列表 + * + * @param tOrder 缴费订单 + * @return 缴费订单 + */ + @Override + public List selectTOrderList(TOrder tOrder) + { + return tOrderMapper.selectTOrderList(tOrder); + } + + /** + * 新增缴费订单 + * + * @param tOrder 缴费订单 + * @return 结果 + */ + @Override + public int insertTOrder(TOrder tOrder) + { + return tOrderMapper.insertTOrder(tOrder); + } + + /** + * 修改缴费订单 + * + * @param tOrder 缴费订单 + * @return 结果 + */ + @Override + public int updateTOrder(TOrder tOrder) + { + return tOrderMapper.updateTOrder(tOrder); + } + + /** + * 批量删除缴费订单 + * + * @param ids 需要删除的缴费订单主键 + * @return 结果 + */ + @Override + public int deleteTOrderByIds(Long[] ids) + { + return tOrderMapper.deleteTOrderByIds(ids); + } + + /** + * 删除缴费订单信息 + * + * @param id 缴费订单主键 + * @return 结果 + */ + @Override + public int deleteTOrderById(Long id) + { + return tOrderMapper.deleteTOrderById(id); + } +} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/resources/banner.txt b/ruoyi-modules/ruoyi-xjt/src/main/resources/banner.txt new file mode 100644 index 00000000..fbd45f53 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} + _ _ + (_) | | + _ __ _ _ ___ _ _ _ ______ ___ _ _ ___ | |_ ___ _ __ ___ +| '__|| | | | / _ \ | | | || ||______|/ __|| | | |/ __|| __| / _ \| '_ ` _ \ +| | | |_| || (_) || |_| || | \__ \| |_| |\__ \| |_ | __/| | | | | | +|_| \__,_| \___/ \__, ||_| |___/ \__, ||___/ \__| \___||_| |_| |_| + __/ | __/ | + |___/ |___/ \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-xjt/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-xjt/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..027d80b0 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/resources/bootstrap.yml @@ -0,0 +1,25 @@ +# Tomcat +server: + port: 9208 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-xjt + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:8848 + config: + # 配置中心地址 + server-addr: 127.0.0.1:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/ruoyi-modules/ruoyi-xjt/src/main/resources/logback.xml b/ruoyi-modules/ruoyi-xjt/src/main/resources/logback.xml new file mode 100644 index 00000000..d39fa0ef --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-xjt/src/main/resources/mapper/xjt/TMoneyMapper.xml b/ruoyi-modules/ruoyi-xjt/src/main/resources/mapper/xjt/TMoneyMapper.xml new file mode 100644 index 00000000..73892a68 --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/resources/mapper/xjt/TMoneyMapper.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + select id, userid, money, tradetype, tradedate, type, note, leftmoney, orderid, state, bbsmallorderid from t_money + + + + + + + + insert into t_money + + userid, + money, + tradetype, + tradedate, + type, + note, + leftmoney, + orderid, + state, + bbsmallorderid, + + + #{userid}, + #{money}, + #{tradetype}, + #{tradedate}, + #{type}, + #{note}, + #{leftmoney}, + #{orderid}, + #{state}, + #{bbsmallorderid}, + + + + + update t_money + + userid = #{userid}, + money = #{money}, + tradetype = #{tradetype}, + tradedate = #{tradedate}, + type = #{type}, + note = #{note}, + leftmoney = #{leftmoney}, + orderid = #{orderid}, + state = #{state}, + bbsmallorderid = #{bbsmallorderid}, + + where id = #{id} + + + + delete from t_money where id = #{id} + + + + delete from t_money where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-modules/ruoyi-xjt/src/main/resources/mapper/xjt/TOrderMapper.xml b/ruoyi-modules/ruoyi-xjt/src/main/resources/mapper/xjt/TOrderMapper.xml new file mode 100644 index 00000000..5673016b --- /dev/null +++ b/ruoyi-modules/ruoyi-xjt/src/main/resources/mapper/xjt/TOrderMapper.xml @@ -0,0 +1,176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, companyid, khuserid, fwsuserid, money, yuepay, fundpay, wxorcftpay, tradetype, ordernum, paytime, createdate, paytype, paystate, trade_no, mch_id, trade_status, cuid, cumoney, refund_audit_userid, refund_money, refund_note, refund_no, refund_state, refund_time, refund_successtime from t_order + + + + + + + + insert into t_order + + companyid, + khuserid, + fwsuserid, + money, + yuepay, + fundpay, + wxorcftpay, + tradetype, + ordernum, + paytime, + createdate, + paytype, + paystate, + trade_no, + mch_id, + trade_status, + cuid, + cumoney, + refund_audit_userid, + refund_money, + refund_note, + refund_no, + refund_state, + refund_time, + refund_successtime, + + + #{companyid}, + #{khuserid}, + #{fwsuserid}, + #{money}, + #{yuepay}, + #{fundpay}, + #{wxorcftpay}, + #{tradetype}, + #{ordernum}, + #{paytime}, + #{createdate}, + #{paytype}, + #{paystate}, + #{tradeNo}, + #{mchId}, + #{tradeStatus}, + #{cuid}, + #{cumoney}, + #{refundAuditUserid}, + #{refundMoney}, + #{refundNote}, + #{refundNo}, + #{refundState}, + #{refundTime}, + #{refundSuccesstime}, + + + + + update t_order + + companyid = #{companyid}, + khuserid = #{khuserid}, + fwsuserid = #{fwsuserid}, + money = #{money}, + yuepay = #{yuepay}, + fundpay = #{fundpay}, + wxorcftpay = #{wxorcftpay}, + tradetype = #{tradetype}, + ordernum = #{ordernum}, + paytime = #{paytime}, + createdate = #{createdate}, + paytype = #{paytype}, + paystate = #{paystate}, + trade_no = #{tradeNo}, + mch_id = #{mchId}, + trade_status = #{tradeStatus}, + cuid = #{cuid}, + cumoney = #{cumoney}, + refund_audit_userid = #{refundAuditUserid}, + refund_money = #{refundMoney}, + refund_note = #{refundNote}, + refund_no = #{refundNo}, + refund_state = #{refundState}, + refund_time = #{refundTime}, + refund_successtime = #{refundSuccesstime}, + + where id = #{id} + + + + delete from t_order where id = #{id} + + + + delete from t_order where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-ui/src/api/xjt/money.js b/ruoyi-ui/src/api/xjt/money.js new file mode 100644 index 00000000..eff44dad --- /dev/null +++ b/ruoyi-ui/src/api/xjt/money.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询支出或收入详情列表 +export function listMoney(query) { + return request({ + url: '/xjt/money/list', + method: 'get', + params: query + }) +} + +// 查询支出或收入详情详细 +export function getMoney(id) { + return request({ + url: '/xjt/money/' + id, + method: 'get' + }) +} + +// 新增支出或收入详情 +export function addMoney(data) { + return request({ + url: '/xjt/money', + method: 'post', + data: data + }) +} + +// 修改支出或收入详情 +export function updateMoney(data) { + return request({ + url: '/xjt/money', + method: 'put', + data: data + }) +} + +// 删除支出或收入详情 +export function delMoney(id) { + return request({ + url: '/xjt/money/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/api/xjt/order.js b/ruoyi-ui/src/api/xjt/order.js new file mode 100644 index 00000000..899d6b6d --- /dev/null +++ b/ruoyi-ui/src/api/xjt/order.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询缴费订单列表 +export function listOrder(query) { + return request({ + url: '/xjt/order/list', + method: 'get', + params: query + }) +} + +// 查询缴费订单详细 +export function getOrder(id) { + return request({ + url: '/xjt/order/' + id, + method: 'get' + }) +} + +// 新增缴费订单 +export function addOrder(data) { + return request({ + url: '/xjt/order', + method: 'post', + data: data + }) +} + +// 修改缴费订单 +export function updateOrder(data) { + return request({ + url: '/xjt/order', + method: 'put', + data: data + }) +} + +// 删除缴费订单 +export function delOrder(id) { + return request({ + url: '/xjt/order/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/xjt/money/index.vue b/ruoyi-ui/src/views/xjt/money/index.vue new file mode 100644 index 00000000..701c706d --- /dev/null +++ b/ruoyi-ui/src/views/xjt/money/index.vue @@ -0,0 +1,365 @@ + + + diff --git a/ruoyi-ui/src/views/xjt/order/index.vue b/ruoyi-ui/src/views/xjt/order/index.vue new file mode 100644 index 00000000..6c6bdbee --- /dev/null +++ b/ruoyi-ui/src/views/xjt/order/index.vue @@ -0,0 +1,608 @@ + + + From 055ef83edb9c417d90e34f395f4956f99cd6937d Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 15 May 2022 10:53:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E6=94=AF=E6=B5=8B=E8=AF=95dev=5Fx?= =?UTF-8?q?jt=5F2022=5F5=5F15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/xjt/controller/XjtUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/XjtUserController.java b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/XjtUserController.java index b8b96f7f..28649c01 100644 --- a/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/XjtUserController.java +++ b/ruoyi-modules/ruoyi-xjt/src/main/java/com/ruoyi/xjt/controller/XjtUserController.java @@ -22,7 +22,7 @@ public class XjtUserController { @Autowired private XjtUserService xjtUserService; /** - * 根据角色编号获取详细信息 + * 根据角色编号获取详细信息---测试分支提交--添加 */ @RequiresPermissions("system:role:query") @GetMapping(value = "/{username}")