结算分配详情调整

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

@@ -137,6 +137,7 @@ public class AdminAccountCloseController extends BaseController {
      */
     @PostMapping("/getBillDetail")
     public JSONObject getBillDetail(@RequestBody String rejson){
+        //{"batchcode":"1657003731168089","close_status":"1","user_isli":"899998-000000001038-3","limit":10,"page":1}
         JSONObject request = JSONObject.parseObject(rejson);
         String uesrIsli= request.getString("user_isli");
         String msg="成功";
@@ -149,8 +150,13 @@ public class AdminAccountCloseController extends BaseController {
         int ilimit = StringUtils.isNotBlank(limit)?Integer.valueOf(limit):20;
         String page = request.getString("page");
         int ipage = StringUtils.isNotBlank(page)?Integer.valueOf(page):1;
+        // 订单编号
+        String batchcode=request.getString("batchcode");
+        if(StringUtils.isEmpty(batchcode)){
+            batchcode=null;
+        }
         //
-        Map rmap = accountCloseService.getBillDetail(uesrIsli,ipage,ilimit);
+        Map rmap = accountCloseService.getBillDetail(uesrIsli,batchcode,ipage,ilimit);
         jsonObject.put("data",rmap);
         jsonObject.put("msg",msg);
         jsonObject.put("code",code);

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

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import java.util.List;
+import java.util.Map;
 
 @Component
 public interface UserAccountBillMapper {
@@ -20,6 +21,17 @@ public interface UserAccountBillMapper {
                                          @Param("startrs") int statrs,
                                          @Param("limit") int limit);
 
+    /**
+     * 多条件查询核销
+     * @param map
+     * @param statrs
+     * @param limit
+     * @return
+     */
+    List<UserAccountBill> getUserAccBillMap(@Param("map") Map map,
+                                         @Param("startrs") int statrs,
+                                         @Param("limit") int limit);
+
     /**
      * 统计用户的交易总笔数
      * @param userisli

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

@@ -59,12 +59,13 @@ public interface AccountCloseService {
 
     /**
      * 账单明细
-     * @param uesrIsli
+     * @param userIsli 用户编号
+     * @param batchcode 订单编号
      * @param ipage
      * @param ilimit
      * @return
      */
-    Map<String,Object> getBillDetail(String uesrIsli,int ipage,int ilimit);
+    Map<String,Object> getBillDetail(String userIsli,String batchcode,int ipage,int ilimit);
 
     /**
      * 设置分配比例

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

@@ -202,11 +202,11 @@ public class AccountCloseServiceImpl implements AccountCloseService {
      * @return
      */
     @Override
-    public Map<String, Object> getBillDetail(String uesrIsli, int ipage, int ilimit) {
+    public Map<String, Object> getBillDetail(String userIsli,String batchcode, int ipage, int ilimit) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map retmap =new HashMap();
         int startrs =ipage>1?(ipage-1)*ilimit:0;
-        int total = userAccountBillMapper.countUserAccBill(uesrIsli);
+        int total = userAccountBillMapper.countUserAccBill(userIsli);
         Integer end = ipage*ilimit;
         Integer start =startrs+1;
         if(total < end){
@@ -222,8 +222,16 @@ public class AccountCloseServiceImpl implements AccountCloseService {
         retmap.put("pre_page",ilimit);
         retmap.put("total",total);
 
+        // 查询map
+        Map<String,String> somap = new HashMap<>();
+        somap.put("user_isli",userIsli);
+        if(batchcode!=null){
+            somap.put("batchcode",batchcode.trim());
+        }
+        List<UserAccountBill> uacblist = userAccountBillMapper.getUserAccBillMap(somap,start,ilimit);
+
         // list
-        List<UserAccountBill> uacblist = userAccountBillMapper.getUserAccBill(uesrIsli,ipage,ilimit);
+        //List<UserAccountBill> uacblist = userAccountBillMapper.getUserAccBill(uesrIsli,ipage,ilimit);
         BigDecimal income = new BigDecimal(0.00); // 收入
         BigDecimal disburse = new BigDecimal(0.00); //支出
 

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

@@ -22,6 +22,23 @@
         limit #{startrs},#{limit}
     </select>
 
+    <!-- 多条件查询记录 -->
+    <select id="getUserAccBillMap" resultType="cn.chjyj.szwh.bean.UserAccountBill">
+        SELECT <include refid="column"/>
+        FROM <include refid="tbName"/>
+        <where>
+            <if test="map!=null">
+                <foreach collection="map" item="v" index="k" separator="and">
+                    <if test="v != null and v != ''">
+                        ${k} = #{v}
+                    </if>
+                </foreach>
+            </if>
+        </where>
+        ORDER BY id DESC
+        LIMIT #{start},#{limit}
+    </select>
+
     <!-- 统计数量 -->
     <select id="countUserAccBill" parameterType="java.lang.String" resultType="java.lang.Integer">
         select count(*) from <include refid="tbName"/> where user_isli=#{userisli}