From cd98c565944fa058e612478e5ef23fec57df05b5 Mon Sep 17 00:00:00 2001 From: wanghongya Date: Tue, 19 May 2020 01:37:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=AE=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/RuoYiApplication.java | 11 - .../system/BusinessFirmController.java | 126 +++++ .../src/main/resources/application-druid.yml | 4 +- ruoyi-admin/src/main/resources/logback.xml | 2 +- .../resources/templates/system/firm/add.html | 238 +++++++++ .../resources/templates/system/firm/edit.html | 233 +++++++++ .../resources/templates/system/firm/firm.html | 341 ++++++++++++ .../resources/vm/java/serviceImpl.java.vm | 4 + .../com/ruoyi/system/domain/BusinessFirm.java | 490 ++++++++++++++++++ .../system/mapper/BusinessFirmMapper.java | 61 +++ .../system/service/IBusinessFirmService.java | 61 +++ .../service/impl/BusinessFirmServiceImpl.java | 101 ++++ .../mapper/system/BusinessFirmMapper.xml | 231 +++++++++ 13 files changed, 1889 insertions(+), 14 deletions(-) create mode 100755 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BusinessFirmController.java create mode 100755 ruoyi-admin/src/main/resources/templates/system/firm/add.html create mode 100755 ruoyi-admin/src/main/resources/templates/system/firm/edit.html create mode 100755 ruoyi-admin/src/main/resources/templates/system/firm/firm.html create mode 100755 ruoyi-system/src/main/java/com/ruoyi/system/domain/BusinessFirm.java create mode 100755 ruoyi-system/src/main/java/com/ruoyi/system/mapper/BusinessFirmMapper.java create mode 100755 ruoyi-system/src/main/java/com/ruoyi/system/service/IBusinessFirmService.java create mode 100755 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BusinessFirmServiceImpl.java create mode 100755 ruoyi-system/src/main/resources/mapper/system/BusinessFirmMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index a0e726bd4..6c774068d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -14,17 +14,6 @@ public class RuoYiApplication { public static void main(String[] args) { - // System.setProperty("spring.devtools.restart.enabled", "false"); SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BusinessFirmController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BusinessFirmController.java new file mode 100755 index 000000000..c1e96cfb9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/BusinessFirmController.java @@ -0,0 +1,126 @@ +package com.ruoyi.web.controller.system; + +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.system.domain.BusinessFirm; +import com.ruoyi.system.service.IBusinessFirmService; +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; + +/** + * 商家信息Controller + * + * @author ruoyi + * @date 2020-05-19 + */ +@Controller +@RequestMapping("/system/firm") +public class BusinessFirmController extends BaseController +{ + private String prefix = "system/firm"; + + @Autowired + private IBusinessFirmService businessFirmService; + + @RequiresPermissions("system:firm:view") + @GetMapping() + public String firm() + { + return prefix + "/firm"; + } + + /** + * 查询商家信息列表 + */ + @RequiresPermissions("system:firm:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BusinessFirm businessFirm) + { + startPage(); + List list = businessFirmService.selectBusinessFirmList(businessFirm); + return getDataTable(list); + } + + /** + * 导出商家信息列表 + */ + @RequiresPermissions("system:firm:export") + @Log(title = "商家信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BusinessFirm businessFirm) + { + List list = businessFirmService.selectBusinessFirmList(businessFirm); + ExcelUtil util = new ExcelUtil(BusinessFirm.class); + return util.exportExcel(list, "firm"); + } + + /** + * 新增商家信息 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存商家信息 + */ + @RequiresPermissions("system:firm:add") + @Log(title = "商家信息", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BusinessFirm businessFirm) + { + return toAjax(businessFirmService.insertBusinessFirm(businessFirm)); + } + + /** + * 修改商家信息 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + BusinessFirm businessFirm = businessFirmService.selectBusinessFirmById(id); + mmap.put("businessFirm", businessFirm); + return prefix + "/edit"; + } + + /** + * 修改保存商家信息 + */ + @RequiresPermissions("system:firm:edit") + @Log(title = "商家信息", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BusinessFirm businessFirm) + { + return toAjax(businessFirmService.updateBusinessFirm(businessFirm)); + } + + /** + * 删除商家信息 + */ + @RequiresPermissions("system:firm:remove") + @Log(title = "商家信息", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(businessFirmService.deleteBusinessFirmByIds(ids)); + } +} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index d69c66d27..a44668034 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://47.105.40.104:3306/gjp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: password + password: root # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index d69a57207..ac97e8f15 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/templates/system/firm/add.html b/ruoyi-admin/src/main/resources/templates/system/firm/add.html new file mode 100755 index 000000000..f4ea00240 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/firm/add.html @@ -0,0 +1,238 @@ + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/firm/edit.html b/ruoyi-admin/src/main/resources/templates/system/firm/edit.html new file mode 100755 index 000000000..f3e2e8cdc --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/firm/edit.html @@ -0,0 +1,233 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+ 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + 代码生成请选择字典属性 +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/firm/firm.html b/ruoyi-admin/src/main/resources/templates/system/firm/firm.html new file mode 100755 index 000000000..5e175d2d9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/firm/firm.html @@ -0,0 +1,341 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index bbeb4de89..57923cd6e 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -12,6 +12,7 @@ import com.ruoyi.common.utils.DateUtils; #end #end import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import org.springframework.stereotype.Service; import ${packageName}.mapper.${ClassName}Mapper; import ${packageName}.domain.${ClassName}; @@ -61,6 +62,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int insert${ClassName}(${ClassName} ${className}) { #foreach ($column in $columns) @@ -78,6 +80,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int update${ClassName}(${ClassName} ${className}) { #foreach ($column in $columns) @@ -95,6 +98,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service * @return 结果 */ @Override + @Transactional(rollbackFor = Exception.class) public int delete${ClassName}ByIds(String ids) { return ${className}Mapper.delete${ClassName}ByIds(Convert.toStrArray(ids)); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BusinessFirm.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BusinessFirm.java new file mode 100755 index 000000000..209bc9deb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BusinessFirm.java @@ -0,0 +1,490 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +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; + +/** + * 商家信息对象 business_firm + * + * @author ruoyi + * @date 2020-05-19 + */ +public class BusinessFirm extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + private Long id; + + /** 商家编号 */ + @Excel(name = "商家编号") + private String businessCode; + + /** 登录账号 */ + @Excel(name = "登录账号") + private String loginName; + + /** 用户昵称 */ + @Excel(name = "用户昵称") + private String userName; + + /** 用户邮箱 */ + @Excel(name = "用户邮箱") + private String email; + + /** 固定电话 */ + @Excel(name = "固定电话") + private String telephoneNo; + + /** 手机号码 */ + @Excel(name = "手机号码") + private String phoneNo; + + /** 用户性别（0男 1女 2未知） */ + @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知") + private String sex; + + /** 头像路径 */ + @Excel(name = "头像路径") + private String avatar; + + /** 身份证证件地址 */ + @Excel(name = "身份证证件地址") + private String idCard; + + /** 房产、合同等证件地址,json串 */ + @Excel(name = "房产、合同等证件地址,json串") + private String credentials; + + /** 密码 */ + @Excel(name = "密码") + private String password; + + /** 盐加密 */ + @Excel(name = "盐加密") + private String salt; + + /** 帐号状态（0正常 1停用） */ + @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 质保金金额 */ + @Excel(name = "质保金金额") + private Long guaranteeMoney; + + /** 已退质保金金额 */ + @Excel(name = "已退质保金金额") + private Long refundGuaranteeMoney; + + /** 商家类型，0个人 1商家 */ + @Excel(name = "商家类型，0个人 1商家") + private String bussinessType; + + /** 省id */ + @Excel(name = "省id") + private String provinceCode; + + /** 省名称 */ + @Excel(name = "省名称") + private String provinceName; + + /** 市ID */ + @Excel(name = "市ID") + private String cityCode; + + /** 市名称 */ + @Excel(name = "市名称") + private String ciityName; + + /** 县ID */ + @Excel(name = "县ID") + private String countyCode; + + /** 县名称 */ + @Excel(name = "县名称") + private String countyName; + + /** 乡/镇ID */ + @Excel(name = "乡/镇ID") + private String townCode; + + /** 乡/镇名称 */ + @Excel(name = "乡/镇名称") + private String townName; + + /** 详细地址信息 */ + @Excel(name = "详细地址信息") + private String adress; + + /** 坐标地址 */ + @Excel(name = "坐标地址") + private String coordinatePoint; + + /** 开户行名称 */ + @Excel(name = "开户行名称") + private String bankName; + + /** 开户行卡号 */ + @Excel(name = "开户行卡号") + private String bankCardNo; + + /** 删除标志（0代表存在 2代表删除） */ + private String delFlag; + + /** 最后登陆ip */ + @Excel(name = "最后登陆ip") + private String loginIp; + + /** 最后登陆时间 */ + @Excel(name = "最后登陆时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date loginDate; + + /** 版本号 */ + @Excel(name = "版本号") + private Integer version; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setBusinessCode(String businessCode) + { + this.businessCode = businessCode; + } + + public String getBusinessCode() + { + return businessCode; + } + public void setLoginName(String loginName) + { + this.loginName = loginName; + } + + public String getLoginName() + { + return loginName; + } + public void setUserName(String userName) + { + this.userName = userName; + } + + public String getUserName() + { + return userName; + } + public void setEmail(String email) + { + this.email = email; + } + + public String getEmail() + { + return email; + } + public void setTelephoneNo(String telephoneNo) + { + this.telephoneNo = telephoneNo; + } + + public String getTelephoneNo() + { + return telephoneNo; + } + public void setPhoneNo(String phoneNo) + { + this.phoneNo = phoneNo; + } + + public String getPhoneNo() + { + return phoneNo; + } + public void setSex(String sex) + { + this.sex = sex; + } + + public String getSex() + { + return sex; + } + public void setAvatar(String avatar) + { + this.avatar = avatar; + } + + public String getAvatar() + { + return avatar; + } + public void setIdCard(String idCard) + { + this.idCard = idCard; + } + + public String getIdCard() + { + return idCard; + } + public void setCredentials(String credentials) + { + this.credentials = credentials; + } + + public String getCredentials() + { + return credentials; + } + public void setPassword(String password) + { + this.password = password; + } + + public String getPassword() + { + return password; + } + public void setSalt(String salt) + { + this.salt = salt; + } + + public String getSalt() + { + return salt; + } + public void setStatus(String status) + { + this.status = status; + } + + public String getStatus() + { + return status; + } + public void setGuaranteeMoney(Long guaranteeMoney) + { + this.guaranteeMoney = guaranteeMoney; + } + + public Long getGuaranteeMoney() + { + return guaranteeMoney; + } + public void setRefundGuaranteeMoney(Long refundGuaranteeMoney) + { + this.refundGuaranteeMoney = refundGuaranteeMoney; + } + + public Long getRefundGuaranteeMoney() + { + return refundGuaranteeMoney; + } + public void setBussinessType(String bussinessType) + { + this.bussinessType = bussinessType; + } + + public String getBussinessType() + { + return bussinessType; + } + public void setProvinceCode(String provinceCode) + { + this.provinceCode = provinceCode; + } + + public String getProvinceCode() + { + return provinceCode; + } + public void setProvinceName(String provinceName) + { + this.provinceName = provinceName; + } + + public String getProvinceName() + { + return provinceName; + } + public void setCityCode(String cityCode) + { + this.cityCode = cityCode; + } + + public String getCityCode() + { + return cityCode; + } + public void setCiityName(String ciityName) + { + this.ciityName = ciityName; + } + + public String getCiityName() + { + return ciityName; + } + public void setCountyCode(String countyCode) + { + this.countyCode = countyCode; + } + + public String getCountyCode() + { + return countyCode; + } + public void setCountyName(String countyName) + { + this.countyName = countyName; + } + + public String getCountyName() + { + return countyName; + } + public void setTownCode(String townCode) + { + this.townCode = townCode; + } + + public String getTownCode() + { + return townCode; + } + public void setTownName(String townName) + { + this.townName = townName; + } + + public String getTownName() + { + return townName; + } + public void setAdress(String adress) + { + this.adress = adress; + } + + public String getAdress() + { + return adress; + } + public void setCoordinatePoint(String coordinatePoint) + { + this.coordinatePoint = coordinatePoint; + } + + public String getCoordinatePoint() + { + return coordinatePoint; + } + public void setBankName(String bankName) + { + this.bankName = bankName; + } + + public String getBankName() + { + return bankName; + } + public void setBankCardNo(String bankCardNo) + { + this.bankCardNo = bankCardNo; + } + + public String getBankCardNo() + { + return bankCardNo; + } + public void setDelFlag(String delFlag) + { + this.delFlag = delFlag; + } + + public String getDelFlag() + { + return delFlag; + } + public void setLoginIp(String loginIp) + { + this.loginIp = loginIp; + } + + public String getLoginIp() + { + return loginIp; + } + public void setLoginDate(Date loginDate) + { + this.loginDate = loginDate; + } + + public Date getLoginDate() + { + return loginDate; + } + public void setVersion(Integer version) + { + this.version = version; + } + + public Integer getVersion() + { + return version; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("businessCode", getBusinessCode()) + .append("loginName", getLoginName()) + .append("userName", getUserName()) + .append("email", getEmail()) + .append("telephoneNo", getTelephoneNo()) + .append("phoneNo", getPhoneNo()) + .append("sex", getSex()) + .append("avatar", getAvatar()) + .append("idCard", getIdCard()) + .append("credentials", getCredentials()) + .append("password", getPassword()) + .append("salt", getSalt()) + .append("status", getStatus()) + .append("guaranteeMoney", getGuaranteeMoney()) + .append("refundGuaranteeMoney", getRefundGuaranteeMoney()) + .append("bussinessType", getBussinessType()) + .append("provinceCode", getProvinceCode()) + .append("provinceName", getProvinceName()) + .append("cityCode", getCityCode()) + .append("ciityName", getCiityName()) + .append("countyCode", getCountyCode()) + .append("countyName", getCountyName()) + .append("townCode", getTownCode()) + .append("townName", getTownName()) + .append("adress", getAdress()) + .append("coordinatePoint", getCoordinatePoint()) + .append("bankName", getBankName()) + .append("bankCardNo", getBankCardNo()) + .append("delFlag", getDelFlag()) + .append("loginIp", getLoginIp()) + .append("loginDate", getLoginDate()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("version", getVersion()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BusinessFirmMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BusinessFirmMapper.java new file mode 100755 index 000000000..a85e06408 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BusinessFirmMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BusinessFirm; + +/** + * 商家信息Mapper接口 + * + * @author ruoyi + * @date 2020-05-19 + */ +public interface BusinessFirmMapper +{ + /** + * 查询商家信息 + * + * @param id 商家信息ID + * @return 商家信息 + */ + public BusinessFirm selectBusinessFirmById(Long id); + + /** + * 查询商家信息列表 + * + * @param businessFirm 商家信息 + * @return 商家信息集合 + */ + public List selectBusinessFirmList(BusinessFirm businessFirm); + + /** + * 新增商家信息 + * + * @param businessFirm 商家信息 + * @return 结果 + */ + public int insertBusinessFirm(BusinessFirm businessFirm); + + /** + * 修改商家信息 + * + * @param businessFirm 商家信息 + * @return 结果 + */ + public int updateBusinessFirm(BusinessFirm businessFirm); + + /** + * 删除商家信息 + * + * @param id 商家信息ID + * @return 结果 + */ + public int deleteBusinessFirmById(Long id); + + /** + * 批量删除商家信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBusinessFirmByIds(String[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBusinessFirmService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBusinessFirmService.java new file mode 100755 index 000000000..41cc910c9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBusinessFirmService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BusinessFirm; + +/** + * 商家信息Service接口 + * + * @author ruoyi + * @date 2020-05-19 + */ +public interface IBusinessFirmService +{ + /** + * 查询商家信息 + * + * @param id 商家信息ID + * @return 商家信息 + */ + public BusinessFirm selectBusinessFirmById(Long id); + + /** + * 查询商家信息列表 + * + * @param businessFirm 商家信息 + * @return 商家信息集合 + */ + public List selectBusinessFirmList(BusinessFirm businessFirm); + + /** + * 新增商家信息 + * + * @param businessFirm 商家信息 + * @return 结果 + */ + public int insertBusinessFirm(BusinessFirm businessFirm); + + /** + * 修改商家信息 + * + * @param businessFirm 商家信息 + * @return 结果 + */ + public int updateBusinessFirm(BusinessFirm businessFirm); + + /** + * 批量删除商家信息 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteBusinessFirmByIds(String ids); + + /** + * 删除商家信息信息 + * + * @param id 商家信息ID + * @return 结果 + */ + public int deleteBusinessFirmById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BusinessFirmServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BusinessFirmServiceImpl.java new file mode 100755 index 000000000..07ad701d7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BusinessFirmServiceImpl.java @@ -0,0 +1,101 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BusinessFirmMapper; +import com.ruoyi.system.domain.BusinessFirm; +import com.ruoyi.system.service.IBusinessFirmService; +import com.ruoyi.common.core.text.Convert; + +/** + * 商家信息Service业务层处理 + * + * @author ruoyi + * @date 2020-05-19 + */ +@Service +public class BusinessFirmServiceImpl implements IBusinessFirmService +{ + @Autowired + private BusinessFirmMapper businessFirmMapper; + + /** + * 查询商家信息 + * + * @param id 商家信息ID + * @return 商家信息 + */ + @Override + public BusinessFirm selectBusinessFirmById(Long id) + { + return businessFirmMapper.selectBusinessFirmById(id); + } + + /** + * 查询商家信息列表 + * + * @param businessFirm 商家信息 + * @return 商家信息 + */ + @Override + public List selectBusinessFirmList(BusinessFirm businessFirm) + { + return businessFirmMapper.selectBusinessFirmList(businessFirm); + } + + /** + * 新增商家信息 + * + * @param businessFirm 商家信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int insertBusinessFirm(BusinessFirm businessFirm) + { + businessFirm.setCreateTime(DateUtils.getNowDate()); + return businessFirmMapper.insertBusinessFirm(businessFirm); + } + + /** + * 修改商家信息 + * + * @param businessFirm 商家信息 + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int updateBusinessFirm(BusinessFirm businessFirm) + { + businessFirm.setUpdateTime(DateUtils.getNowDate()); + return businessFirmMapper.updateBusinessFirm(businessFirm); + } + + /** + * 删除商家信息对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public int deleteBusinessFirmByIds(String ids) + { + return businessFirmMapper.deleteBusinessFirmByIds(Convert.toStrArray(ids)); + } + + /** + * 删除商家信息信息 + * + * @param id 商家信息ID + * @return 结果 + */ + @Override + public int deleteBusinessFirmById(Long id) + { + return businessFirmMapper.deleteBusinessFirmById(id); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/system/BusinessFirmMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BusinessFirmMapper.xml new file mode 100755 index 000000000..f2c93cdf6 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/BusinessFirmMapper.xml @@ -0,0 +1,231 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, business_code, login_name, user_name, email, telephone_no, phone_no, sex, avatar, id_card, credentials, password, salt, status, guarantee_money, refund_guarantee_money, bussiness_type, province_code, province_name, city_code, ciity_name, county_code, county_name, town_code, town_name, adress, coordinate_point, bank_name, bank_card_no, del_flag, login_ip, login_date, create_by, create_time, update_by, update_time, version, remark from business_firm + + + + + + + + insert into business_firm + + business_code, + login_name, + user_name, + email, + telephone_no, + phone_no, + sex, + avatar, + id_card, + credentials, + password, + salt, + status, + guarantee_money, + refund_guarantee_money, + bussiness_type, + province_code, + province_name, + city_code, + ciity_name, + county_code, + county_name, + town_code, + town_name, + adress, + coordinate_point, + bank_name, + bank_card_no, + del_flag, + login_ip, + login_date, + create_by, + create_time, + update_by, + update_time, + version, + remark, + + + #{businessCode}, + #{loginName}, + #{userName}, + #{email}, + #{telephoneNo}, + #{phoneNo}, + #{sex}, + #{avatar}, + #{idCard}, + #{credentials}, + #{password}, + #{salt}, + #{status}, + #{guaranteeMoney}, + #{refundGuaranteeMoney}, + #{bussinessType}, + #{provinceCode}, + #{provinceName}, + #{cityCode}, + #{ciityName}, + #{countyCode}, + #{countyName}, + #{townCode}, + #{townName}, + #{adress}, + #{coordinatePoint}, + #{bankName}, + #{bankCardNo}, + #{delFlag}, + #{loginIp}, + #{loginDate}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{version}, + #{remark}, + + + + + update business_firm + + business_code = #{businessCode}, + login_name = #{loginName}, + user_name = #{userName}, + email = #{email}, + telephone_no = #{telephoneNo}, + phone_no = #{phoneNo}, + sex = #{sex}, + avatar = #{avatar}, + id_card = #{idCard}, + credentials = #{credentials}, + password = #{password}, + salt = #{salt}, + status = #{status}, + guarantee_money = #{guaranteeMoney}, + refund_guarantee_money = #{refundGuaranteeMoney}, + bussiness_type = #{bussinessType}, + province_code = #{provinceCode}, + province_name = #{provinceName}, + city_code = #{cityCode}, + ciity_name = #{ciityName}, + county_code = #{countyCode}, + county_name = #{countyName}, + town_code = #{townCode}, + town_name = #{townName}, + adress = #{adress}, + coordinate_point = #{coordinatePoint}, + bank_name = #{bankName}, + bank_card_no = #{bankCardNo}, + del_flag = #{delFlag}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + version = #{version}, + remark = #{remark}, + + where id = #{id} + + + + delete from business_firm where id = #{id} + + + + delete from business_firm where id in + + #{id} + + + + \ No newline at end of file