增加个人信息openId

src/main/java/com/winhc/repal/model/bo/SearchBillPageBO.java

@@ -25,5 +25,7 @@ public class SearchBillPageBO {
 
     private Long userId;
 
+    private Integer repalBillType;
+
 
 }

src/main/java/com/winhc/repal/model/vo/MemberInfoVO.java

@@ -27,4 +27,7 @@ public class MemberInfoVO {
 
     @ApiModelProperty("上限数量")
     private Integer maxCount;
+
+    @ApiModelProperty("openId")
+    private String openId;
 }

src/main/java/com/winhc/repal/service/impl/RepalBillServiceImpl.java

@@ -260,18 +260,22 @@ public class RepalBillServiceImpl extends ServiceImpl<RepalBillMapper, RepalBill
         // 分页数据
         Page<RepalBill> repalBillPage = new Page<>(dto.getPageNum(),dto.getPageSize());
         SearchBillPageBO searchBillPageBO = new SearchBillPageBO();
-        if (Objects.isNull(dto.getRepalBillType())) {
-            searchBillPageBO.setReceivableFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIVABLE.getCode()));
-            searchBillPageBO.setReceiptFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIPT.getCode()));
-        } else {
-            if (RepalBillTypeEnum.RECEIVABLE.getCode().equals(dto.getRepalBillType())) {
-                searchBillPageBO.setReceivableFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIVABLE.getCode()));
-                searchBillPageBO.setReceiptFlag(false);
-            } else {
-                searchBillPageBO.setReceivableFlag(false);
-                searchBillPageBO.setReceiptFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIPT.getCode()));
-            }
-        }
+        searchBillPageBO.setReceivableFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIVABLE.getCode()));
+        searchBillPageBO.setReceiptFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIPT.getCode()));
+        searchBillPageBO.setRepalBillType(dto.getRepalBillType());
+//        if (Objects.isNull(dto.getRepalBillType())) {
+//            searchBillPageBO.setReceivableFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIVABLE.getCode()));
+//            searchBillPageBO.setReceiptFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIPT.getCode()));
+//        } else {
+//            searchBillPageBO.setRepalBillType(dto.getRepalBillType());
+//            if (RepalBillTypeEnum.RECEIVABLE.getCode().equals(dto.getRepalBillType())) {
+//                searchBillPageBO.setReceivableFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIVABLE.getCode()));
+//                searchBillPageBO.setReceiptFlag(false);
+//            } else {
+//                searchBillPageBO.setReceivableFlag(false);
+//                searchBillPageBO.setReceiptFlag(repalRolePermissionService.checkUserPermission(userId, PermissionEnum.QUERY_ALL_RECEIPT.getCode()));
+//            }
+//        }
         searchBillPageBO.setKeyword(dto.getKeyword());
         searchBillPageBO.setUserId(userId);
         searchBillPageBO.setRepalGroupId(groupId);

src/main/java/com/winhc/repal/service/impl/RepalGroupMemberServiceImpl.java

@@ -264,7 +264,14 @@ public class RepalGroupMemberServiceImpl extends ServiceImpl<RepalGroupMemberMap
     @Override
     public MemberInfoVO getMemberInfo() {
         long userId = UserContextUtil.getUser().getUserId();
+        ThirdPartyAccount account = thirdPartyAccountService.getOne(Wrappers.lambdaQuery(ThirdPartyAccount.class)
+                .eq(ThirdPartyAccount::getUserId, userId)
+                .eq(ThirdPartyAccount::getDeleted, DeletedStatusEnum.NORMAL.getCode()));
+        if (Objects.isNull(account)) {
+            throw new CommonException(CodeMsg.FAILED, "个人信息错误");
+        }
         MemberInfoVO info = repalGroupMemberMapper.getMemberInfo(userId);
+        info.setOpenId(account.getOpenId());
         info.setMemberCount(this.count(Wrappers.lambdaQuery(RepalGroupMember.class)
                 .eq(RepalGroupMember::getRepalGroupId, info.getRepalGroupId())
                 .eq(RepalGroupMember::getDeleted, DeletedStatusEnum.NORMAL.getCode())));

src/main/resources/mapper/RepalBillMapper.xml

@@ -157,14 +157,31 @@
         LEFT JOIN REPAL_RESPONSIBLE_PERSON AS aPerson ON aPerson.REPAL_BILL_ID = bill.ID and bill.REPAL_BILL_TYPE = 1 and aPerson.DELETED = 0
         LEFT JOIN REPAL_RESPONSIBLE_PERSON AS bPerson ON bPerson.REPAL_BILL_ID = bill.ID and bill.REPAL_BILL_TYPE = 2 and bPerson.DELETED = 0
         <where>
-            <if test="!param2.allFlag">
-                <if test="!param2.receivableFlag and param2.receiptFlag">
-                    (aPerson.USER_ID = #{param2.userId} or bPerson.USER_ID is not null)
+            <if test="param2.repalBillType != null">
+                <if test="param2.repalBillType == 1">
+                    <if test="!param2.receivableFlag">
+                        (aPerson.USER_ID = #{param2.userId})
+                    </if>
                 </if>
-                <if test="!param2.receiptFlag and param2.receivableFlag">
-                    (bPerson.USER_ID = #{param2.userId} or aPerson.USER_ID is not null)
+                <if test="param2.repalBillType == 2">
+                    <if test="!param2.receiptFlag">
+                        (bPerson.USER_ID = #{param2.userId})
+                    </if>
                 </if>
             </if>
+            <if test="param2.repalBillType == null">
+                <if test="!param2.allFlag">
+                    <if test="!param2.receivableFlag and param2.receiptFlag">
+                        (aPerson.USER_ID = #{param2.userId} or bPerson.USER_ID is not null)
+                    </if>
+                    <if test="!param2.receiptFlag and param2.receivableFlag">
+                        (bPerson.USER_ID = #{param2.userId} or aPerson.USER_ID is not null)
+                    </if>
+                </if>
+            </if>
+        <if test="param2.repalBillType != null">
+            AND bill.REPAL_BILL_TYPE = #{param2.repalBillType}
+        </if>
         AND bill.REPAL_BOOK_ID = #{param2.repalBookId}
         AND bill.REPAL_GROUP_ID = #{param2.repalGroupId}
         AND bill.DELETED = 0