更新账户详情

src/main/java/cn/chjyj/szwh/controller/admin/AdminAccountCloseController.java

@@ -78,11 +78,12 @@ public class AdminAccountCloseController extends BaseController {
 
     /**
      * 资金结算获取账户详情
-     * @param userIsli
+     * @param request
      * @return
      */
     @RequestMapping("/getCloseAccountInfo")
-    public JSONObject getCloseAccountInfo(@RequestParam("user_isli") String userIsli){
+    public JSONObject getCloseAccountInfo(HttpServletRequest request){
+        String userIsli=request.getParameter("user_isli");
         // 返回用户的信息
         Map usinfo = userService.getUserInfo(userIsli);
         jsonObject.put("data",usinfo);
@@ -116,6 +117,32 @@ public class AdminAccountCloseController extends BaseController {
         return jsonObject;
     }
 
+    /**
+     * 账单明细
+     * @return
+     */
+    @PostMapping("/getBillDetail")
+    public JSONObject getBillDetail(@RequestBody String rejson){
+        JSONObject request = JSONObject.parseObject(rejson);
+        String uesrIsli= request.getString("user_isli");
+        String msg="成功";
+        int code=200;
+        if(StringUtils.isBlank(uesrIsli)){
+            msg="参数不能为空";
+            code=400;
+        }
+        String limit = request.getString("limit");
+        int ilimit = StringUtils.isNotBlank(limit)?Integer.valueOf(limit):20;
+        String page = request.getString("page");
+        int ipage = StringUtils.isNotBlank(page)?Integer.valueOf(page):1;
+        //
+        Map rmap = accountCloseService.getBillDetail(uesrIsli,ipage,ilimit);
+        jsonObject.put("data",rmap);
+        jsonObject.put("msg",msg);
+        jsonObject.put("code",code);
+        return jsonObject;
+    }
+
     /**
      * 设置详情
      * @param rjson

src/main/java/cn/chjyj/szwh/mapper/UserAccountBillMapper.java

@@ -19,4 +19,11 @@ public interface UserAccountBillMapper {
     List<UserAccountBill> getUserAccBill(@Param("userisli") String userisli,
                                          @Param("startrs") int statrs,
                                          @Param("limit") int limit);
+
+    /**
+     * 统计用户的交易总笔数
+     * @param userisli
+     * @return
+     */
+    int countUserAccBill(String userisli);
 }

src/main/java/cn/chjyj/szwh/service/AccountCloseService.java

@@ -58,4 +58,13 @@ public interface AccountCloseService {
      * @return
      */
     int ratioStatus(Integer id);
+
+    /**
+     * 账单明细
+     * @param uesrIsli
+     * @param ipage
+     * @param ilimit
+     * @return
+     */
+    Map<String,Object> getBillDetail(String uesrIsli,int ipage,int ilimit);
 }

src/main/java/cn/chjyj/szwh/service/impl/AccountCloseServiceImpl.java

@@ -1,9 +1,7 @@
 package cn.chjyj.szwh.service.impl;
 
 
-import cn.chjyj.szwh.bean.AccountRatioDetail;
-import cn.chjyj.szwh.bean.AccountRatioSetting;
-import cn.chjyj.szwh.bean.PaySetting;
+import cn.chjyj.szwh.bean.*;
 import cn.chjyj.szwh.mapper.*;
 import cn.chjyj.szwh.service.AccountCloseService;
 import cn.chjyj.szwh.vo.SettleVo;
@@ -11,6 +9,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -23,6 +22,9 @@ public class AccountCloseServiceImpl implements AccountCloseService {
     private PaySettingMapper paySettingMapper;
     @Autowired
     private OrderUserMapper orderUserMapper;
+    @Autowired
+    private OrderMapper orderMapper;
+
     @Autowired
     private AccountRatioSettingMapper accountRatioSettingMapper;
     @Autowired
@@ -31,6 +33,10 @@ public class AccountCloseServiceImpl implements AccountCloseService {
     @Autowired
     private AdminMapper adminMapper;
 
+    //用户账单
+    @Autowired
+    private UserAccountBillMapper userAccountBillMapper;
+
     @Override
     public Map getPaySetting() {
         Map retmap =new HashMap();
@@ -163,4 +169,49 @@ public class AccountCloseServiceImpl implements AccountCloseService {
         }
         return accountRatioSettingMapper.ratioStatus(nstatus,id);
     }
+
+    /**
+     * 账单明细
+     * @param uesrIsli
+     * @param ipage
+     * @param ilimit
+     * @return
+     */
+    @Override
+    public Map<String, Object> getBillDetail(String uesrIsli, int ipage, int ilimit) {
+        Map retmap =new HashMap();
+        int startrs =ipage>1?(ipage-1)*ilimit:0;
+        int total = userAccountBillMapper.countUserAccBill(uesrIsli);
+        retmap.put("curpage",ipage);
+        retmap.put("start",startrs+1);
+        retmap.put("end",ipage*ilimit);
+        retmap.put("pre_page",ilimit);
+        retmap.put("total",total);
+
+        // list
+        List<UserAccountBill> uacblist = userAccountBillMapper.getUserAccBill(uesrIsli,ipage,ilimit);
+        BigDecimal income = new BigDecimal(0); // 收入
+        BigDecimal disburse = new BigDecimal(0); //支出
+
+        List retlist =new ArrayList();
+        for(UserAccountBill uac:uacblist){
+            // 用户信息
+            Map odumap =new HashMap();
+            OrderUser orderUser = orderUserMapper.getUserOrder(uac.getBatchcode(),uac.getUserIsli());
+            odumap.put("order_user",orderUser);
+            retlist.add(odumap);
+
+            //结算情况
+            Order order = orderMapper.getOrderByBatchcode(uac.getBatchcode());
+            odumap.put("close_status",order.getCloseStatus());
+
+            //
+            retlist.add(odumap);
+        }
+
+        retmap.put("income",income);
+        retmap.put("disburse",disburse);
+        retmap.put("data",uacblist);
+        return retmap;
+    }
 }

src/main/resources/mapper/szwh/UserAccountBillMapper.xml

@@ -23,12 +23,9 @@
         limit #{limit}
     </select>
 
-    <!--查询用户名,加上密码-->
-    <select id="getUserByIsli" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.User">
-        select<include refid="column"/>,password
-        from
-        <include refid="tbName"/>
-        where user_isli=#{userIsli} limit 1;
+    <!-- 统计数量 -->
+    <select id="countUserAccBill" parameterType="java.lang.String" resultType="java.lang.Integer">
+        select count(*) from <include refid="tbName"/> where user_isli=#{userisli}
     </select>
 
     <!--查询用户-->