From 150354941c1d9f969f488e80b02f49675bb88c02 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 13 Sep 2024 10:43:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=20=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E5=95=86--=E5=88=86=E6=B6=A6=E4=BC=9A=E5=91=98=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E5=85=B3=E7=B3=BB=E8=A1=A8=E3=80=81=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E3=80=81Service?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/ShareprofitGroupController.java | 98 +++++ jsowell-admin/src/main/resources/rebel.xml | 16 + jsowell-common/src/main/resources/rebel.xml | 16 + .../src/main/resources/rebel.xml | 16 + .../src/main/resources/rebel.xml | 16 + jsowell-netty/src/main/resources/rebel.xml | 16 + .../ShareprofitMerchantMemberRelation.java | 67 ++++ ...areprofitMerchantMemberRelationMapper.java | 63 ++++ ...reprofitMerchantMemberRelationService.java | 61 ++++ ...ofitMerchantMemberRelationServiceImpl.java | 89 +++++ ...hareprofitMerchantMemberRelationMapper.xml | 65 ++++ jsowell-pile/src/main/resources/rebel.xml | 16 + jsowell-quartz/src/main/resources/rebel.xml | 16 + .../src/main/resources/rebel.xml | 16 + jsowell-system/src/main/resources/rebel.xml | 16 + .../src/main/resources/rebel.xml | 16 + jsowell-ui/src/api/pile/shareprofitGroup.js | 44 +++ .../src/views/pile/shareprofit/index.vue | 337 ++++++++++++++++++ 18 files changed, 984 insertions(+) create mode 100644 jsowell-admin/src/main/java/com/jsowell/web/controller/pile/ShareprofitGroupController.java create mode 100644 jsowell-admin/src/main/resources/rebel.xml create mode 100644 jsowell-common/src/main/resources/rebel.xml create mode 100644 jsowell-framework/src/main/resources/rebel.xml create mode 100644 jsowell-generator/src/main/resources/rebel.xml create mode 100644 jsowell-netty/src/main/resources/rebel.xml create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/domain/shareprofit/ShareprofitMerchantMemberRelation.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitMerchantMemberRelationMapper.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitMerchantMemberRelationService.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitMerchantMemberRelationServiceImpl.java create mode 100644 jsowell-pile/src/main/resources/mapper/pile/ShareprofitMerchantMemberRelationMapper.xml create mode 100644 jsowell-pile/src/main/resources/rebel.xml create mode 100644 jsowell-quartz/src/main/resources/rebel.xml create mode 100644 jsowell-settlement/src/main/resources/rebel.xml create mode 100644 jsowell-system/src/main/resources/rebel.xml create mode 100644 jsowell-thirdparty/src/main/resources/rebel.xml create mode 100644 jsowell-ui/src/api/pile/shareprofitGroup.js create mode 100644 jsowell-ui/src/views/pile/shareprofit/index.vue diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/ShareprofitGroupController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/ShareprofitGroupController.java new file mode 100644 index 000000000..c727e18a1 --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/ShareprofitGroupController.java @@ -0,0 +1,98 @@ +package com.jsowell.web.controller.pile; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.security.access.prepost.PreAuthorize; +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.jsowell.common.annotation.Log; +import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.core.domain.AjaxResult; +import com.jsowell.common.enums.BusinessType; +import com.jsowell.pile.domain.shareprofit.ShareprofitGroup; +import com.jsowell.pile.service.IShareprofitGroupService; +import com.jsowell.common.util.poi.ExcelUtil; +import com.jsowell.common.core.page.TableDataInfo; + +/** + * 运营商分润组Controller + * + * @author jsowell + * @date 2024-09-12 + */ +@RestController +@RequestMapping("/pile/shareprofitGroup") +public class ShareprofitGroupController extends BaseController { + @Autowired + private IShareprofitGroupService shareprofitGroupService; + + /** + * 查询运营商分润组列表 + */ + @PreAuthorize("@ss.hasPermi('pile:shareprofitGroup:list')") + @GetMapping("/list") + public TableDataInfo list(ShareprofitGroup shareprofitGroup) { + startPage(); + List list = shareprofitGroupService.selectShareprofitGroupList(shareprofitGroup); + return getDataTable(list); + } + + /** + * 导出运营商分润组列表 + */ + @PreAuthorize("@ss.hasPermi('pile:shareprofitGroup:export')") + @Log(title = "运营商分润组", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ShareprofitGroup shareprofitGroup) { + List list = shareprofitGroupService.selectShareprofitGroupList(shareprofitGroup); + ExcelUtil util = new ExcelUtil(ShareprofitGroup.class); + util.exportExcel(response, list, "运营商分润组数据"); + } + + /** + * 获取运营商分润组详细信息 + */ + @PreAuthorize("@ss.hasPermi('pile:shareprofitGroup:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(shareprofitGroupService.selectShareprofitGroupById(id)); + } + + /** + * 新增运营商分润组 + */ + @PreAuthorize("@ss.hasPermi('pile:shareprofitGroup:add')") + @Log(title = "运营商分润组", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ShareprofitGroup shareprofitGroup) { + return toAjax(shareprofitGroupService.insertShareprofitGroup(shareprofitGroup)); + } + + /** + * 修改运营商分润组 + */ + @PreAuthorize("@ss.hasPermi('pile:shareprofitGroup:edit')") + @Log(title = "运营商分润组", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ShareprofitGroup shareprofitGroup) { + return toAjax(shareprofitGroupService.updateShareprofitGroup(shareprofitGroup)); + } + + /** + * 删除运营商分润组 + */ + @PreAuthorize("@ss.hasPermi('pile:shareprofitGroup:remove')") + @Log(title = "运营商分润组", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(shareprofitGroupService.deleteShareprofitGroupByIds(ids)); + } +} diff --git a/jsowell-admin/src/main/resources/rebel.xml b/jsowell-admin/src/main/resources/rebel.xml new file mode 100644 index 000000000..daf29e9f1 --- /dev/null +++ b/jsowell-admin/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-admin + + + + + + + diff --git a/jsowell-common/src/main/resources/rebel.xml b/jsowell-common/src/main/resources/rebel.xml new file mode 100644 index 000000000..0d1543ec6 --- /dev/null +++ b/jsowell-common/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-common + + + + + + + diff --git a/jsowell-framework/src/main/resources/rebel.xml b/jsowell-framework/src/main/resources/rebel.xml new file mode 100644 index 000000000..0396a3905 --- /dev/null +++ b/jsowell-framework/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-framework + + + + + + + diff --git a/jsowell-generator/src/main/resources/rebel.xml b/jsowell-generator/src/main/resources/rebel.xml new file mode 100644 index 000000000..b16c21c47 --- /dev/null +++ b/jsowell-generator/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-generator + + + + + + + diff --git a/jsowell-netty/src/main/resources/rebel.xml b/jsowell-netty/src/main/resources/rebel.xml new file mode 100644 index 000000000..5363ab0c3 --- /dev/null +++ b/jsowell-netty/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-netty + + + + + + + diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/shareprofit/ShareprofitMerchantMemberRelation.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/shareprofit/ShareprofitMerchantMemberRelation.java new file mode 100644 index 000000000..7a0d4ac48 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/shareprofit/ShareprofitMerchantMemberRelation.java @@ -0,0 +1,67 @@ +package com.jsowell.pile.domain.shareprofit; + +import com.jsowell.common.annotation.Excel; +import com.jsowell.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 运营商--分润人关系对象 shareprofit_merchant_member_relation + * + * @author jsowell + * @date 2024-09-12 + */ +public class ShareprofitMerchantMemberRelation extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + + /** + * 运营商id + */ + @Excel(name = "运营商id") + private Long merchantId; + + /** + * 分润人电话号码 + */ + @Excel(name = "分润人电话号码") + private String memberPhoneNumber; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setMerchantId(Long merchantId) { + this.merchantId = merchantId; + } + + public Long getMerchantId() { + return merchantId; + } + + public void setMemberPhoneNumber(String memberPhoneNumber) { + this.memberPhoneNumber = memberPhoneNumber; + } + + public String getMemberPhoneNumber() { + return memberPhoneNumber; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) + .append("id", getId()) + .append("merchantId", getMerchantId()) + .append("memberPhoneNumber", getMemberPhoneNumber()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitMerchantMemberRelationMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitMerchantMemberRelationMapper.java new file mode 100644 index 000000000..6c54ebee6 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitMerchantMemberRelationMapper.java @@ -0,0 +1,63 @@ +package com.jsowell.pile.mapper; + +import java.util.List; + +import com.jsowell.pile.domain.shareprofit.ShareprofitMerchantMemberRelation; +import org.springframework.stereotype.Repository; + +/** + * 运营商--分润人关系Mapper接口 + * + * @author jsowell + * @date 2024-09-12 + */ +@Repository +public interface ShareprofitMerchantMemberRelationMapper { + /** + * 查询运营商--分润人关系 + * + * @param id 运营商--分润人关系主键 + * @return 运营商--分润人关系 + */ + public ShareprofitMerchantMemberRelation selectShareprofitMerchantMemberRelationById(Long id); + + /** + * 查询运营商--分润人关系列表 + * + * @param shareprofitMerchantMemberRelation 运营商--分润人关系 + * @return 运营商--分润人关系集合 + */ + public List selectShareprofitMerchantMemberRelationList(ShareprofitMerchantMemberRelation shareprofitMerchantMemberRelation); + + /** + * 新增运营商--分润人关系 + * + * @param shareprofitMerchantMemberRelation 运营商--分润人关系 + * @return 结果 + */ + public int insertShareprofitMerchantMemberRelation(ShareprofitMerchantMemberRelation shareprofitMerchantMemberRelation); + + /** + * 修改运营商--分润人关系 + * + * @param shareprofitMerchantMemberRelation 运营商--分润人关系 + * @return 结果 + */ + public int updateShareprofitMerchantMemberRelation(ShareprofitMerchantMemberRelation shareprofitMerchantMemberRelation); + + /** + * 删除运营商--分润人关系 + * + * @param id 运营商--分润人关系主键 + * @return 结果 + */ + public int deleteShareprofitMerchantMemberRelationById(Long id); + + /** + * 批量删除运营商--分润人关系 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteShareprofitMerchantMemberRelationByIds(Long[] ids); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitMerchantMemberRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitMerchantMemberRelationService.java new file mode 100644 index 000000000..5ff068d6c --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitMerchantMemberRelationService.java @@ -0,0 +1,61 @@ +package com.jsowell.pile.service; + +import java.util.List; + +import com.jsowell.pile.domain.shareprofit.ShareprofitMerchantMemberRelation; + +/** + * 运营商--分润人关系Service接口 + * + * @author jsowell + * @date 2024-09-12 + */ +public interface IShareprofitMerchantMemberRelationService { + /** + * 查询运营商--分润人关系 + * + * @param id 运营商--分润人关系主键 + * @return 运营商--分润人关系 + */ + public ShareprofitMerchantMemberRelation selectShareprofitMerchantMemberRelationById(Long id); + + /** + * 查询运营商--分润人关系列表 + * + * @param shareprofitMerchantMemberRelation 运营商--分润人关系 + * @return 运营商--分润人关系集合 + */ + public List selectShareprofitMerchantMemberRelationList(ShareprofitMerchantMemberRelation shareprofitMerchantMemberRelation); + + /** + * 新增运营商--分润人关系 + * + * @param shareprofitMerchantMemberRelation 运营商--分润人关系 + * @return 结果 + */ + public int insertShareprofitMerchantMemberRelation(ShareprofitMerchantMemberRelation shareprofitMerchantMemberRelation); + + /** + * 修改运营商--分润人关系 + * + * @param shareprofitMerchantMemberRelation 运营商--分润人关系 + * @return 结果 + */ + public int updateShareprofitMerchantMemberRelation(ShareprofitMerchantMemberRelation shareprofitMerchantMemberRelation); + + /** + * 批量删除运营商--分润人关系 + * + * @param ids 需要删除的运营商--分润人关系主键集合 + * @return 结果 + */ + public int deleteShareprofitMerchantMemberRelationByIds(Long[] ids); + + /** + * 删除运营商--分润人关系信息 + * + * @param id 运营商--分润人关系主键 + * @return 结果 + */ + public int deleteShareprofitMerchantMemberRelationById(Long id); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitMerchantMemberRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitMerchantMemberRelationServiceImpl.java new file mode 100644 index 000000000..4c2a0ac76 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitMerchantMemberRelationServiceImpl.java @@ -0,0 +1,89 @@ +package com.jsowell.pile.service.impl; + +import java.util.List; + +import com.jsowell.common.util.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.jsowell.pile.mapper.ShareprofitMerchantMemberRelationMapper; +import com.jsowell.pile.domain.shareprofit.ShareprofitMerchantMemberRelation; +import com.jsowell.pile.service.IShareprofitMerchantMemberRelationService; + +/** + * 运营商--分润人关系Service业务层处理 + * + * @author jsowell + * @date 2024-09-12 + */ +@Service +public class ShareprofitMerchantMemberRelationServiceImpl implements IShareprofitMerchantMemberRelationService { + @Autowired + private ShareprofitMerchantMemberRelationMapper shareprofitMerchantMemberRelationMapper; + + /** + * 查询运营商--分润人关系 + * + * @param id 运营商--分润人关系主键 + * @return 运营商--分润人关系 + */ + @Override + public ShareprofitMerchantMemberRelation selectShareprofitMerchantMemberRelationById(Long id) { + return shareprofitMerchantMemberRelationMapper.selectShareprofitMerchantMemberRelationById(id); + } + + /** + * 查询运营商--分润人关系列表 + * + * @param shareprofitMerchantMemberRelation 运营商--分润人关系 + * @return 运营商--分润人关系 + */ + @Override + public List selectShareprofitMerchantMemberRelationList(ShareprofitMerchantMemberRelation shareprofitMerchantMemberRelation) { + return shareprofitMerchantMemberRelationMapper.selectShareprofitMerchantMemberRelationList(shareprofitMerchantMemberRelation); + } + + /** + * 新增运营商--分润人关系 + * + * @param shareprofitMerchantMemberRelation 运营商--分润人关系 + * @return 结果 + */ + @Override + public int insertShareprofitMerchantMemberRelation(ShareprofitMerchantMemberRelation shareprofitMerchantMemberRelation) { + shareprofitMerchantMemberRelation.setCreateTime(DateUtils.getNowDate()); + return shareprofitMerchantMemberRelationMapper.insertShareprofitMerchantMemberRelation(shareprofitMerchantMemberRelation); + } + + /** + * 修改运营商--分润人关系 + * + * @param shareprofitMerchantMemberRelation 运营商--分润人关系 + * @return 结果 + */ + @Override + public int updateShareprofitMerchantMemberRelation(ShareprofitMerchantMemberRelation shareprofitMerchantMemberRelation) { + return shareprofitMerchantMemberRelationMapper.updateShareprofitMerchantMemberRelation(shareprofitMerchantMemberRelation); + } + + /** + * 批量删除运营商--分润人关系 + * + * @param ids 需要删除的运营商--分润人关系主键 + * @return 结果 + */ + @Override + public int deleteShareprofitMerchantMemberRelationByIds(Long[] ids) { + return shareprofitMerchantMemberRelationMapper.deleteShareprofitMerchantMemberRelationByIds(ids); + } + + /** + * 删除运营商--分润人关系信息 + * + * @param id 运营商--分润人关系主键 + * @return 结果 + */ + @Override + public int deleteShareprofitMerchantMemberRelationById(Long id) { + return shareprofitMerchantMemberRelationMapper.deleteShareprofitMerchantMemberRelationById(id); + } +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/ShareprofitMerchantMemberRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ShareprofitMerchantMemberRelationMapper.xml new file mode 100644 index 000000000..6101923d8 --- /dev/null +++ b/jsowell-pile/src/main/resources/mapper/pile/ShareprofitMerchantMemberRelationMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + select id, merchant_id, member_phone_number, create_time from shareprofit_merchant_member_relation + + + + + + + + insert into shareprofit_merchant_member_relation + + merchant_id, + member_phone_number, + create_time, + + + #{merchantId}, + #{memberPhoneNumber}, + #{createTime}, + + + + + update shareprofit_merchant_member_relation + + merchant_id = #{merchantId}, + member_phone_number = #{memberPhoneNumber}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from shareprofit_merchant_member_relation where id = #{id} + + + + delete from shareprofit_merchant_member_relation where id in + + #{id} + + + \ No newline at end of file diff --git a/jsowell-pile/src/main/resources/rebel.xml b/jsowell-pile/src/main/resources/rebel.xml new file mode 100644 index 000000000..28f3fcb94 --- /dev/null +++ b/jsowell-pile/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-pile + + + + + + + diff --git a/jsowell-quartz/src/main/resources/rebel.xml b/jsowell-quartz/src/main/resources/rebel.xml new file mode 100644 index 000000000..3b7520900 --- /dev/null +++ b/jsowell-quartz/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-quartz + + + + + + + diff --git a/jsowell-settlement/src/main/resources/rebel.xml b/jsowell-settlement/src/main/resources/rebel.xml new file mode 100644 index 000000000..e697f3d05 --- /dev/null +++ b/jsowell-settlement/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-settlement + + + + + + + diff --git a/jsowell-system/src/main/resources/rebel.xml b/jsowell-system/src/main/resources/rebel.xml new file mode 100644 index 000000000..e7c1b45e7 --- /dev/null +++ b/jsowell-system/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-system + + + + + + + diff --git a/jsowell-thirdparty/src/main/resources/rebel.xml b/jsowell-thirdparty/src/main/resources/rebel.xml new file mode 100644 index 000000000..2850391df --- /dev/null +++ b/jsowell-thirdparty/src/main/resources/rebel.xml @@ -0,0 +1,16 @@ + + + + + + jsowell-thirdparty + + + + + + + diff --git a/jsowell-ui/src/api/pile/shareprofitGroup.js b/jsowell-ui/src/api/pile/shareprofitGroup.js new file mode 100644 index 000000000..c0a21db70 --- /dev/null +++ b/jsowell-ui/src/api/pile/shareprofitGroup.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询运营商分润组列表 +export function listGroup(query) { + return request({ + url: '/pile/shareprofitGroup/list', + method: 'get', + params: query + }) +} + +// 查询运营商分润组详细 +export function getGroup(id) { + return request({ + url: '/pile/shareprofitGroup/' + id, + method: 'get' + }) +} + +// 新增运营商分润组 +export function addGroup(data) { + return request({ + url: '/pile/shareprofitGroup', + method: 'post', + data: data + }) +} + +// 修改运营商分润组 +export function updateGroup(data) { + return request({ + url: '/pile/shareprofitGroup', + method: 'put', + data: data + }) +} + +// 删除运营商分润组 +export function delGroup(id) { + return request({ + url: '/pile/shareprofitGroup/' + id, + method: 'delete' + }) +} diff --git a/jsowell-ui/src/views/pile/shareprofit/index.vue b/jsowell-ui/src/views/pile/shareprofit/index.vue new file mode 100644 index 000000000..0a488bb7f --- /dev/null +++ b/jsowell-ui/src/views/pile/shareprofit/index.vue @@ -0,0 +1,337 @@ + + +