收款列表参数

src/main/java/com/caimei365/order/model/bo/ReceiptParamsBo.java

@@ -21,7 +21,7 @@ public class ReceiptParamsBo implements Serializable {
     /**
      * 收款款项类型：1订单款，2非订单款，3返佣款
      */
-    private String receiptType;
+    private Integer receiptType;
     /**
      * 短信内容Md5加密串
      */
@@ -54,7 +54,7 @@ public class ReceiptParamsBo implements Serializable {
     /**
      * 订单状态集合
      */
-    private List<Integer> orderStatus;
+    private List<Integer> orderStatusList;
     /**
      * 客户名称
      */

src/main/java/com/caimei365/order/service/impl/ReceiptServiceImpl.java

@@ -471,6 +471,10 @@ public class ReceiptServiceImpl implements ReceiptService {
      */
     @Override
     public ResponseJson<PageInfo<ReceiptVo>> getReceiptList(Integer receiptType, String receiptStatusStr, String smsContent, String startDate, String endDate, String openid, int pageNum, int pageSize) {
+        ReceiptUserVo receiptUser = receiptMapper.getReceiptUserByOpenid(openid);
+        if (null == receiptUser){
+            return ResponseJson.error("请重新授权登录！", null);
+        }
         ReceiptParamsBo paramsBo = new ReceiptParamsBo();
         Integer receiptStatus = null;
         if (StringUtils.isNotBlank(smsContent)) {
@@ -493,6 +497,9 @@ public class ReceiptServiceImpl implements ReceiptService {
         // 获取该收款用户下的机构userIds
         List<Integer> clubUserIds = getReceiptClubUserIds(openid, receiptStatus);
         paramsBo.setUserIds(clubUserIds);
+        paramsBo.setReceiptType(receiptType);
+        paramsBo.setStartDate(startDate);
+        paramsBo.setEndDate(endDate);
         // 分页请求数据
         PageHelper.startPage(pageNum, pageSize);
         List<ReceiptVo> list = receiptMapper.getReceiptList(paramsBo);
@@ -613,7 +620,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         params.setOrderId(orderId);
         params.setExcludeOrderId(excludeOrderId);
         params.setReceiptStatusArr(receiptStatusArr);
-        params.setOrderStatus(orderStatus);
+        params.setOrderStatusList(orderStatus);
         params.setUserName(userName);
         params.setOrganizeId(organizeId);
         params.setOrderType(type);

src/main/resources/mapper/ReceiptMapper.xml

@@ -467,7 +467,7 @@
                 #{receiptStatus}
             </foreach>
             AND o.status IN
-            <foreach collection="orderStatus" open="(" close=")" item="status" separator=",">
+            <foreach collection="orderStatusList" open="(" close=")" item="status" separator=",">
                 #{status}
             </foreach>
             <if test="userIds != null and userIds.size() > 0">