From ed83491e1f341f2fa2410a60020b4ead3391c47a Mon Sep 17 00:00:00 2001 From: xyiege Date: Wed, 20 Jul 2022 09:57:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E8=B4=A6=E6=AF=94=E4=BE=8B=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/AdminAccountCloseController.java | 45 ++++++++++++------- .../mapper/AccountRatioSettingMapper.java | 15 +++++++ .../szwh/service/AccountCloseService.java | 14 ++++++ .../service/impl/AccountCloseServiceImpl.java | 45 +++++++++++++++++++ .../mapper/szwh/AccountRatioSettingMapper.xml | 19 ++++++-- .../mapper/AccountRatioSettingMapperTest.java | 16 +++++++ 6 files changed, 135 insertions(+), 19 deletions(-) diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java index ff3d157..b7e3676 100644 --- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java +++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java @@ -5,10 +5,7 @@ import cn.chjyj.szwh.service.AccountCloseService; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; @@ -25,46 +22,46 @@ public class AdminAccountCloseController extends BaseController { /** * 资金结算对账账单列表 - * @param request + * @param rejson post 发来的json * @return */ @RequestMapping("/closeList") - public JSONObject closeList(HttpServletRequest request){ - + public JSONObject closeList(@RequestBody String rejson){ + JSONObject request = JSONObject.parseObject(rejson); Map qmap =new HashMap(); // 结算人 - String userName=request.getParameter("user_name"); + String userName=request.getString("user_name"); if(StringUtils.isNotBlank(userName)){ qmap.put("user_name",userName); } //结算账户 - String closeAccount=request.getParameter("close_account"); + String closeAccount=request.getString("close_account"); if(StringUtils.isNotBlank(closeAccount)){ qmap.put("close_account",closeAccount); } //银行卡号 - String bankAccount= request.getParameter("bank_account"); + String bankAccount= request.getString("bank_account"); if(StringUtils.isNotBlank(bankAccount)){ qmap.put("bank_account",bankAccount); } //状态 - String status =request.getParameter("status"); + String status =request.getString("status"); if(StringUtils.isNotBlank(status)){ qmap.put("status",status); } // 类型 - String type = request.getParameter("type"); + String type = request.getString("type"); if(StringUtils.isNotBlank(type)){ qmap.put("type",type); } //每页大小 - String limit = request.getParameter("limit"); + String limit = request.getString("limit"); int ilimit = StringUtils.isNotBlank(limit)?20:Integer.valueOf(limit); // 当前页码 - String page = request.getParameter("page"); + String page = request.getString("page"); int ipage = StringUtils.isNotBlank(page)?1:Integer.valueOf(page); //执行搜索查询 @@ -88,7 +85,25 @@ public class AdminAccountCloseController extends BaseController { return jsonObject; } - public JSONObject ratioList(){ + /** + * 结算表 + * @param rejson + * @return + */ + @PostMapping("/ratioList") + public JSONObject ratioList(@RequestBody String rejson){ + JSONObject request =JSONObject.parseObject(rejson); + String ruleName = request.getString("'rule_name'"); + String userId=request.getString("user_id"); + String status = request.getString("status"); + String createtime = request.getString("createtime"); + String page = request.getString("page"); + int ipage = StringUtils.isNotBlank(page)?Integer.valueOf(page):1; + + String limit = request.getString("limit"); + int ilimit =StringUtils.isNotBlank(limit)?Integer.valueOf(limit):10; + // + accountCloseService.ratioList(ruleName,userId,status,createtime,ipage,ilimit); return jsonObject; } /** diff --git a/src/main/java/cn/chjyj/szwh/mapper/AccountRatioSettingMapper.java b/src/main/java/cn/chjyj/szwh/mapper/AccountRatioSettingMapper.java index d1402ac..7e6fa88 100644 --- a/src/main/java/cn/chjyj/szwh/mapper/AccountRatioSettingMapper.java +++ b/src/main/java/cn/chjyj/szwh/mapper/AccountRatioSettingMapper.java @@ -1,8 +1,12 @@ package cn.chjyj.szwh.mapper; import cn.chjyj.szwh.bean.AccountRatioSetting; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Map; + /** * 分账比例设置 */ @@ -14,4 +18,15 @@ public interface AccountRatioSettingMapper { * @return */ AccountRatioSetting getAccRatioSettingById(Integer id); + + /** + * 查询列表 + * @param imap + * @param statrs + * @param limit + * @return + */ + List getRatioSettingList(@Param("map") Map imap, + @Param("startrs") Integer statrs, + @Param("limit") Integer limit); } diff --git a/src/main/java/cn/chjyj/szwh/service/AccountCloseService.java b/src/main/java/cn/chjyj/szwh/service/AccountCloseService.java index 44476f6..8872c14 100644 --- a/src/main/java/cn/chjyj/szwh/service/AccountCloseService.java +++ b/src/main/java/cn/chjyj/szwh/service/AccountCloseService.java @@ -2,6 +2,7 @@ package cn.chjyj.szwh.service; import cn.chjyj.szwh.bean.PaySetting; +import java.util.List; import java.util.Map; /** @@ -28,4 +29,17 @@ public interface AccountCloseService { * @return */ Map closeList(Map qmap,int limit,int page); + + /** + * 分账比例列表 + * @param ruleName + * @param userId + * @param status + * @param createtime + * @param ipage + * @param ilimit + * @return + */ + Map ratioList(String ruleName,String userId,String status, + String createtime,Integer ipage,Integer ilimit); } diff --git a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java index fcd9217..3d80681 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java @@ -1,7 +1,9 @@ package cn.chjyj.szwh.service.impl; +import cn.chjyj.szwh.bean.AccountRatioSetting; import cn.chjyj.szwh.bean.PaySetting; +import cn.chjyj.szwh.mapper.AccountRatioSettingMapper; import cn.chjyj.szwh.mapper.OrderUserMapper; import cn.chjyj.szwh.mapper.PaySettingMapper; import cn.chjyj.szwh.service.AccountCloseService; @@ -10,6 +12,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -20,6 +23,8 @@ public class AccountCloseServiceImpl implements AccountCloseService { private PaySettingMapper paySettingMapper; @Autowired private OrderUserMapper orderUserMapper; + @Autowired + private AccountRatioSettingMapper accountRatioSettingMapper; @Override public Map getPaySetting() { @@ -87,4 +92,44 @@ public class AccountCloseServiceImpl implements AccountCloseService { retmap.put("data",xlist); return retmap; } + + @Override + public Map ratioList(String ruleName, String userId, String status, String createtime, + Integer ipage, Integer ilimit) { + + //拼装查询条件 + Map query =new HashMap(); + if(StringUtils.isNotBlank(ruleName)){ + query.put("rule_name",ruleName); + } + if(StringUtils.isNotBlank(userId)){ + query.put("user_id",userId); + } + if(StringUtils.isNotBlank(status)){ + query.put("status",status); + } + if(StringUtils.isNotBlank(createtime)){ + query.put("createtime",createtime); + } + + Map retmap=new HashMap(); + int startrs=ipage>1?(ipage-1)*ilimit:0; + retmap.put("start",startrs+1); + retmap.put("cur_page",ipage); + retmap.put("limit",ilimit); + retmap.put("end",ipage*ilimit); + + List acrlist = accountRatioSettingMapper.getRatioSettingList(query,startrs,ilimit); + List retlist = new ArrayList(); + for(AccountRatioSetting acs:acrlist){ + Map amap =new HashMap(); + amap.put("reule_name",acs.getRuleName()); + amap.put("id",acs.getId()); + amap.put("user_id",acs.getUserId()); + amap.put("createtime",acs.getCreatetime()); + retlist.add(amap); + } + retmap.put("data",retlist); + return retmap; + } } diff --git a/src/main/resources/mapper/szwh/AccountRatioSettingMapper.xml b/src/main/resources/mapper/szwh/AccountRatioSettingMapper.xml index b028d8e..23a75e8 100644 --- a/src/main/resources/mapper/szwh/AccountRatioSettingMapper.xml +++ b/src/main/resources/mapper/szwh/AccountRatioSettingMapper.xml @@ -24,13 +24,24 @@ where id=#{id}; - - select - + id,user_id as userId,rule_name as ruleName,createtime,status,createtime,is_deleted from - where account_id=#{accountId} + + + + + ${k} = #{v} + + + and + + id>#{startrs} + + limit #{limit} diff --git a/src/test/java/cn/chjyj/szwh/mapper/AccountRatioSettingMapperTest.java b/src/test/java/cn/chjyj/szwh/mapper/AccountRatioSettingMapperTest.java index 4723d91..b3a18f6 100644 --- a/src/test/java/cn/chjyj/szwh/mapper/AccountRatioSettingMapperTest.java +++ b/src/test/java/cn/chjyj/szwh/mapper/AccountRatioSettingMapperTest.java @@ -8,6 +8,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import static org.junit.Assert.*; @SpringBootTest @@ -21,4 +25,16 @@ public class AccountRatioSettingMapperTest { AccountRatioSetting accs = accountRatioSettingMapper.getAccRatioSettingById(id); System.out.println(accs.getRuleName()); } + + @Test + public void getRatioSettingList(){ + Map imap =new HashMap<>(); + int starrs=0; + int limit=10; + List slist = accountRatioSettingMapper.getRatioSettingList(imap,starrs,limit); + for(AccountRatioSetting acs:slist){ + System.out.println(acs.getRuleName()); + } + System.out.println(slist.size()); + } } \ No newline at end of file