结算及分账

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

@@ -3,12 +3,14 @@ package cn.chjyj.szwh.controller.admin;
 import cn.chjyj.szwh.controller.BaseController;
 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.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -19,6 +21,58 @@ import java.util.Map;
 public class AdminAccountCloseController extends BaseController {
     @Autowired
     private AccountCloseService accountCloseService;
+
+    /**
+     * 资金结算对账账单列表
+     * @param request
+     * @return
+     */
+    @PostMapping("/closeList")
+    public JSONObject closeList(HttpServletRequest request){
+
+        Map qmap =new HashMap();
+        // 结算人
+        String userName=request.getParameter("user_name");
+        if(StringUtils.isNotBlank(userName)){
+            qmap.put("user_name",userName);
+        }
+        //结算账户
+        String closeAccount=request.getParameter("close_account");
+        if(StringUtils.isNotBlank(closeAccount)){
+            qmap.put("close_account",closeAccount);
+        }
+        //银行卡号
+        String bankAccount= request.getParameter("bank_account");
+        if(StringUtils.isNotBlank(bankAccount)){
+            qmap.put("bank_account",bankAccount);
+        }
+        //状态
+        String status =request.getParameter("status");
+        if(StringUtils.isNotBlank(status)){
+            qmap.put("status",status);
+        }
+
+        // 类型
+        String type = request.getParameter("type");
+        if(StringUtils.isNotBlank(type)){
+            qmap.put("type",type);
+        }
+
+        //每页大小
+        String limit = request.getParameter("limit");
+        int ilimit = StringUtils.isNotBlank(limit)?20:Integer.valueOf(limit);
+
+        // 当前页码
+        String page = request.getParameter("page");
+        int ipage = StringUtils.isNotBlank(page)?1:Integer.valueOf(page);
+
+        //执行搜索查询
+        Map rmap =accountCloseService.closeList(qmap,ilimit,ipage);
+        jsonObject.put("code",200);
+        jsonObject.put("data",rmap);
+        jsonObject.put("msg","成功");
+        return jsonObject;
+    }
     /**
      * 获取支付方式
      * @return

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -27,4 +28,10 @@ public interface OrderUserMapper {
      * @return
      */
     List<Integer> isligroup();
+
+    /**
+     * 订单结算
+     * @return
+     */
+    Map ordercs();
 }

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

@@ -19,4 +19,13 @@ public interface AccountCloseService {
      * @return
      */
     int setPaySetting(int alipay,int wechaPay,int ebankPay);
+
+    /**
+     * 结算列表
+     * @param qmap
+     * @param limit
+     * @param page
+     * @return
+     */
+    Map<String,Object> closeList(Map qmap,int limit,int page);
 }

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

@@ -2,6 +2,7 @@ package cn.chjyj.szwh.service.impl;
 
 
 import cn.chjyj.szwh.bean.PaySetting;
+import cn.chjyj.szwh.mapper.OrderUserMapper;
 import cn.chjyj.szwh.mapper.PaySettingMapper;
 import cn.chjyj.szwh.service.AccountCloseService;
 import org.apache.commons.lang3.StringUtils;
@@ -9,12 +10,15 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Service
 public class AccountCloseServiceImpl implements AccountCloseService {
     @Autowired
     private PaySettingMapper paySettingMapper;
+    @Autowired
+    private OrderUserMapper orderUserMapper;
 
     @Override
     public Map getPaySetting() {
@@ -52,4 +56,19 @@ public class AccountCloseServiceImpl implements AccountCloseService {
         }
         return ret;
     }
+
+    /**
+     * 结算列表实现
+     * @param qmap
+     * @param limit
+     * @param page
+     * @return
+     */
+    @Override
+    public Map<String, Object> closeList(Map qmap, int limit, int page) {
+        // 按照用户isli 分组
+        //List<Integer> idlist=orderUserMapper.isligroup();
+        Map xmap = orderUserMapper.ordercs();
+        return xmap;
+    }
 }

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

@@ -27,11 +27,13 @@
         GROUP By islicode
     </select>
 
-    <!--查询用户名,加上密码-->
-    <select id="getUserByUname" parameterType="java.lang.String" resultType="cn.chjyj.szwh.bean.Goods">
-        select <include refid="column"/>,password
-        from <include refid="tbName"/>
-        where uname=#{uname} limit 1;
+    <!-- 订单结算 -->
+    <select id="ordercs" parameterType="java.lang.String">
+    SELECT u.islicode as islicode,u.`name`,u.publicAccount,
+    u.bankName,u.userType,o.close_status FROM order_user u
+    INNER JOIN `order` o ON u.batchcode=o.batchcode
+    WHERE u.id IN (SELECT MAX(id) FROM order_user GROUP BY islicode)
+    ORDER BY u.id DESC
     </select>
 
     <!--查询用户-->