更新代码

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

@@ -27,7 +27,7 @@ public class AdminAccountCloseController extends BaseController {
      * @param request
      * @return
      */
-    @PostMapping("/closeList")
+    @RequestMapping("/closeList")
     public JSONObject closeList(HttpServletRequest request){
 
         Map qmap =new HashMap();

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

@@ -1,6 +1,7 @@
 package cn.chjyj.szwh.mapper;
 
 import cn.chjyj.szwh.bean.OrderUser;
+import cn.chjyj.szwh.vo.SettleVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
@@ -33,5 +34,5 @@ public interface OrderUserMapper {
      * 订单结算
      * @return
      */
-    List<String> ordercs();
+    List<SettleVo> ordercs();
 }

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

@@ -5,6 +5,7 @@ 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 cn.chjyj.szwh.vo.SettleVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -74,8 +75,15 @@ public class AccountCloseServiceImpl implements AccountCloseService {
         retmap.put("page",page);
         retmap.put("per_page",limit);
         // 按照用户isli 分组
-        //List<Integer> idlist=orderUserMapper.isligroup();
+        String query=""; //附加查询条件
-        List xlist = orderUserMapper.ordercs();
+
+        // 组装查询条件
+        if(qmap!=null){
+            //for(Map.Entry<String,String> mp:qmap.entrySet()){
+
+            //}
+        }
+        List<SettleVo> xlist = orderUserMapper.ordercs();
         retmap.put("data",xlist);
         return retmap;
     }

src/main/java/cn/chjyj/szwh/vo/SettleVo.java

@@ -0,0 +1,62 @@
+package cn.chjyj.szwh.vo;
+
+/**
+ * 资金和财务结算vo
+ * 映射订单与用户
+ */
+public class SettleVo {
+    private String slicode;
+    private String name;
+    private String publicAccount;
+    private String bankName;
+    private String userType;
+    private int close_status;
+
+    public String getSlicode() {
+        return slicode;
+    }
+
+    public void setSlicode(String slicode) {
+        this.slicode = slicode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPublicAccount() {
+        return publicAccount;
+    }
+
+    public void setPublicAccount(String publicAccount) {
+        this.publicAccount = publicAccount;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public int getClose_status() {
+        return close_status;
+    }
+
+    public void setClose_status(int close_status) {
+        this.close_status = close_status;
+    }
+}

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

@@ -28,7 +28,7 @@
     </select>
 
     <!-- 订单结算 -->
-    <select id="ordercs" resultType="java.lang.String">
+    <select id="ordercs" resultType="cn.chjyj.szwh.vo.SettleVo">
     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

src/test/java/cn/chjyj/szwh/mapper/OrderUserMapperTest.java

@@ -1,6 +1,7 @@
 package cn.chjyj.szwh.mapper;
 
 import cn.chjyj.szwh.bean.OrderUser;
+import cn.chjyj.szwh.vo.SettleVo;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +38,9 @@ public class OrderUserMapperTest {
 
     @Test
     public void ordcs(){
-        List<String> xxlist = orderUserMapper.ordercs();
+        List<SettleVo> xxlist = orderUserMapper.ordercs();
-        System.out.println(xxlist.size());
+        for(SettleVo sl:xxlist){
+            System.out.println(sl.getBankName());
+        }
     }
 }