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 index c727e18a1..4c1b12e5c 100644 --- 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 @@ -3,6 +3,8 @@ package com.jsowell.web.controller.pile; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.jsowell.common.response.RestApiResponse; +import com.jsowell.pile.vo.web.ShareprofitGroupVO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -45,6 +47,15 @@ public class ShareprofitGroupController extends BaseController { return getDataTable(list); } + @PostMapping("/getShareprofitGroupList") + public RestApiResponse getShareprofitGroupList(@RequestBody ShareprofitGroup shareprofitGroup) { + RestApiResponse response = null; + startPage(); + List list = shareprofitGroupService.getShareprofitGroupVOList(shareprofitGroup); + response = new RestApiResponse<>(list); + return response; + } + /** * 导出运营商分润组列表 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitGroupMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitGroupMapper.java index fa12ec584..4e065e31d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitGroupMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitGroupMapper.java @@ -3,6 +3,7 @@ package com.jsowell.pile.mapper; import java.util.List; import com.jsowell.pile.domain.shareprofit.ShareprofitGroup; +import com.jsowell.pile.vo.web.ShareprofitGroupVO; import org.springframework.stereotype.Repository; /** @@ -60,4 +61,10 @@ public interface ShareprofitGroupMapper { * @return 结果 */ public int deleteShareprofitGroupByIds(Long[] ids); + + /** + * 查询运营商分润组列表VO + * @param shareprofitGroup + */ + List getShareprofitGroupVOList(ShareprofitGroup shareprofitGroup); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitGroupService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitGroupService.java index bd0d459ab..12acb35d2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitGroupService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitGroupService.java @@ -3,6 +3,7 @@ package com.jsowell.pile.service; import java.util.List; import com.jsowell.pile.domain.shareprofit.ShareprofitGroup; +import com.jsowell.pile.vo.web.ShareprofitGroupVO; /** * 运营商分润组Service接口 @@ -27,6 +28,13 @@ public interface IShareprofitGroupService { */ public List selectShareprofitGroupList(ShareprofitGroup shareprofitGroup); + /** + * 查询运营商分润组列表VOList + * @param shareprofitGroup + * @return + */ + List getShareprofitGroupVOList(ShareprofitGroup shareprofitGroup); + /** * 新增运营商分润组 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitGroupServiceImpl.java index 739ab7a72..035bb1696 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitGroupServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitGroupServiceImpl.java @@ -3,6 +3,7 @@ package com.jsowell.pile.service.impl; import java.util.List; import com.jsowell.common.util.DateUtils; +import com.jsowell.pile.vo.web.ShareprofitGroupVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jsowell.pile.mapper.ShareprofitGroupMapper; @@ -42,6 +43,11 @@ public class ShareprofitGroupServiceImpl implements IShareprofitGroupService { return shareprofitGroupMapper.selectShareprofitGroupList(shareprofitGroup); } + @Override + public List getShareprofitGroupVOList(ShareprofitGroup shareprofitGroup){ + return shareprofitGroupMapper.getShareprofitGroupVOList(shareprofitGroup); + } + /** * 新增运营商分润组 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareprofitGroupVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareprofitGroupVO.java new file mode 100644 index 000000000..8e77b1b3e --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ShareprofitGroupVO.java @@ -0,0 +1,37 @@ +package com.jsowell.pile.vo.web; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 分润组VO + * + * @author Lemon + * @Date 2024/9/14 13:41:09 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class ShareprofitGroupVO { + + private String merchantId; + + private String merchantName; + + private String stationId; + + private String stationName; + + private String memberPhoneNumber; + + private String electricityFeeScale; + + private String serviceFeeScale; + + private String undertakeHandlingCharge; + + +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/ShareprofitGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ShareprofitGroupMapper.xml index d272ff081..ad45687b4 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ShareprofitGroupMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ShareprofitGroupMapper.xml @@ -103,4 +103,27 @@ #{id} + + \ No newline at end of file diff --git a/jsowell-ui/src/api/pile/shareprofitGroup.js b/jsowell-ui/src/api/pile/shareprofitGroup.js index c0a21db70..dae648e25 100644 --- a/jsowell-ui/src/api/pile/shareprofitGroup.js +++ b/jsowell-ui/src/api/pile/shareprofitGroup.js @@ -9,6 +9,14 @@ export function listGroup(query) { }) } +export function getShareprofitGroupList(data) { + return request({ + url: '/pile/shareprofitGroup/getShareprofitGroupList', + method: 'post', + data: data + }) +} + // 查询运营商分润组详细 export function getGroup(id) { return request({ diff --git a/jsowell-ui/src/views/pile/shareprofit/group/index.vue b/jsowell-ui/src/views/pile/shareprofit/group/index.vue index 0a488bb7f..5736e219b 100644 --- a/jsowell-ui/src/views/pile/shareprofit/group/index.vue +++ b/jsowell-ui/src/views/pile/shareprofit/group/index.vue @@ -1,31 +1,31 @@