机构类型

FullCardClient/src/main/java/com/zhongshu/card/client/model/payment/WalletRechargeSearch.java

@@ -28,4 +28,10 @@ public class WalletRechargeSearch extends SuperSearch {
 
     @Schema(description = "关联的退款订单数据ID")
     private String aboutDataId;
+
+    @Schema(description = "年份，如：2024")
+    private String year;
+
+    @Schema(description = "月份，如06")
+    private String month;
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/WalletDao.java

@@ -0,0 +1,15 @@
+package com.zhongshu.card.server.core.dao.payment;
+
+import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
+import com.zhongshu.card.server.core.dao.payment.extend.ComplexDaoExtend;
+import com.zhongshu.card.server.core.domain.payment.Complex;
+import com.zhongshu.card.server.core.domain.payment.Wallet;
+
+import java.util.List;
+
+public interface WalletDao extends MongoDao<Wallet> {
+
+    // 根据用户ID查询钱包信息
+    Wallet findByUserId(String userId);
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/WalletRechargeDao.java

@@ -0,0 +1,11 @@
+package com.zhongshu.card.server.core.dao.payment;
+
+import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
+import com.zhongshu.card.server.core.dao.payment.extend.WalletRechargeExtend;
+import com.zhongshu.card.server.core.domain.payment.WalletRecharge;
+
+public interface WalletRechargeDao extends MongoDao<WalletRecharge>, WalletRechargeExtend {
+
+    WalletRecharge findTopById(String id);
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/extend/WalletRechargeExtend.java

@@ -0,0 +1,17 @@
+package com.zhongshu.card.server.core.dao.payment.extend;
+
+import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
+import com.zhongshu.card.client.model.school.BookInfoSearch;
+import com.zhongshu.card.server.core.domain.payment.WalletRecharge;
+import com.zhongshu.card.server.core.domain.school.BookInfo;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+
+/**
+ * @Author TRX
+ * @CreateDate: 2023/7/7
+ * @Version: 1.0
+ */
+public interface WalletRechargeExtend {
+    Page<WalletRecharge> page(Pageable pageable, WalletRechargeSearch param);
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/payment/impl/WalletRechargeDaoImpl.java

@@ -0,0 +1,104 @@
+package com.zhongshu.card.server.core.dao.payment.impl;
+
+import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
+import com.zhongshu.card.client.model.payment.WalletRechargeSearch;
+import com.zhongshu.card.client.model.school.BookInfoSearch;
+import com.zhongshu.card.server.core.dao.BaseImpl;
+import com.zhongshu.card.server.core.dao.payment.extend.WalletRechargeExtend;
+import com.zhongshu.card.server.core.dao.school.extend.BookInfoDaoExtend;
+import com.zhongshu.card.server.core.domain.org.Department;
+import com.zhongshu.card.server.core.domain.payment.WalletRecharge;
+import com.zhongshu.card.server.core.domain.school.BookInfo;
+import com.zhongshu.card.server.core.util.CommonUtil;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * @Author TRX
+ * @CreateDate: 2023/4/12
+ * @Version: 1.0
+ */
+public class WalletRechargeDaoImpl extends BaseImpl implements WalletRechargeExtend {
+
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Autowired
+    private DBHelper dbHelper;
+
+    @Override
+    public Page<WalletRecharge> page(Pageable pageable, WalletRechargeSearch param) {
+        Criteria criteria = new Criteria();
+
+        //
+        if (ObjectUtils.isNotEmpty(param.getUserId())) {
+            criteria.and("userId").is(param.getUserId());
+        }
+
+        // 充值类型
+        if (param.getRechargeType() != null) {
+            criteria.and("rechargeType").is(param.getRechargeType());
+        }
+
+        if (StringUtils.isNotEmpty(param.getAboutDataId())) {
+            criteria.and("aboutDataId").is(param.getAboutDataId());
+        }
+
+        if (StringUtils.isNotEmpty(param.getYear())) {
+            criteria.and("year").is(param.getYear());
+        }
+
+        if (StringUtils.isNotEmpty(param.getMonth())) {
+            criteria.and("month").is(param.getMonth());
+        }
+
+        if (!CommonUtil.longIsEmpty(param.getStartTime()) && !CommonUtil.longIsEmpty(param.getEndTime())) {
+            criteria.and("createTime").gte(param.getStartTime()).and("createTime").lte(param.getEndTime());
+        }
+
+//        // 模糊搜索
+//        List<Criteria> criterias = new ArrayList<>();
+//        if (StringUtils.isNotEmpty(param.getName())) {
+//            Pattern pattern = Pattern.compile("^.*" + param.getName() + ".*$");
+//            criterias.add(Criteria.where("name").is(pattern));
+//        }
+//        if (StringUtils.isNotEmpty(param.getPhone())) {
+//            Pattern pattern = Pattern.compile("^.*" + param.getPhone() + ".*$");
+//            criterias.add(Criteria.where("phone").is(pattern));
+//        }
+//        if (StringUtils.isNotEmpty(param.getIdCard())) {
+//            Pattern pattern = Pattern.compile("^.*" + param.getIdCard() + ".*$");
+//            criterias.add(Criteria.where("idCard").is(pattern));
+//        }
+//        if (StringUtils.isNotEmpty(param.getCode())) {
+//            Pattern pattern = Pattern.compile("^.*" + param.getCode() + ".*$");
+//            criterias.add(Criteria.where("code").is(pattern));
+//        }
+//
+//        if (StringUtils.isNotEmpty(param.getClassName())) {
+//            Pattern pattern = Pattern.compile("^.*" + param.getClassName() + ".*$");
+//            criterias.add(Criteria.where("className").is(pattern));
+//        }
+//        if (!CollectionUtils.isEmpty(criterias)) {
+//            criteria.andOperator(criterias.toArray(new Criteria[]{}));
+//        }
+        criteria.and("isDelete").is(Boolean.FALSE);
+        Sort sort = buildSort(param);
+        Query query = Query.query(criteria);
+        query.with(sort);
+        return dbHelper.pages(query, pageable, WalletRecharge.class);
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/WalletRecharge.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.domain.payment;
 
 import com.zhongshu.card.client.utils.type.RechargeType;
+import com.zhongshu.card.server.core.domain.base.SuperMain;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -22,7 +23,7 @@ import java.math.BigDecimal;
 @Document
 @AllArgsConstructor
 @NoArgsConstructor
-public class WalletRecharge {
+public class WalletRecharge extends SuperMain {
 
     @Schema(description = "关联钱包信息")
     @DBRef(lazy = true)

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/mqtt/MqttServiceImpl.java

@@ -7,8 +7,6 @@ import com.zhongshu.card.client.model.mqtt.SendMessageModel;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.httpRequest.ApiRequestService;
-import com.zhongshu.card.server.core.httpRequest.apiConf.APIResponseModel;
-import com.zhongshu.card.server.core.httpRequest.conf.IotCenterAPIConfig;
 import com.zhongshu.card.server.core.service.base.RedisService;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.mqtt.mqttConfig.client.MQClient;
@@ -23,8 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.annotation.JmsListener;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.UUID;
 
 /**

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/WalletService.java

@@ -0,0 +1,39 @@
+package com.zhongshu.card.server.core.service.payment;
+
+import com.zhongshu.card.client.ret.ResultContent;
+import com.zhongshu.card.server.core.dao.org.UserCountDao;
+import com.zhongshu.card.server.core.dao.payment.WalletDao;
+import com.zhongshu.card.server.core.dao.payment.WalletRechargeDao;
+import com.zhongshu.card.server.core.service.base.SuperService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author TRX
+ * @date 2024/6/29
+ */
+@Slf4j
+@Service
+public class WalletService extends SuperService {
+
+    @Autowired
+    WalletDao walletDao;
+
+    @Autowired
+    WalletRechargeDao walletRechargeDao;
+
+    @Autowired
+    UserCountDao userCountDao;
+
+    /**
+     * 初始用户钱包
+     *
+     * @param userId
+     * @return
+     */
+    public ResultContent initUserWallet(String userId) {
+
+        return ResultContent.buildSuccess();
+    }
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/BookInfoServiceImpl.java

@@ -11,10 +11,7 @@ import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.school.BookInfoDao;
 import com.zhongshu.card.server.core.domain.org.Department;
-import com.zhongshu.card.server.core.domain.org.Organization;
-import com.zhongshu.card.server.core.domain.org.OrganizationUser;
 import com.zhongshu.card.server.core.domain.school.BookInfo;
-import com.zhongshu.card.server.core.domain.school.NoticeInfo;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import lombok.extern.slf4j.Slf4j;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/NoticeInfoServiceImpl.java

@@ -1,8 +1,6 @@
 package com.zhongshu.card.server.core.service.school;
 
 import com.github.microservice.components.data.base.util.PageEntityUtil;
-import com.zhongshu.card.client.model.org.RoleModel;
-import com.zhongshu.card.client.model.org.RoleSearchParam;
 import com.zhongshu.card.client.model.school.*;
 import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.ret.ResultMessage;
@@ -11,7 +9,6 @@ import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.school.NoticeInfoDao;
 import com.zhongshu.card.server.core.dao.school.NoticeInfoViewDao;
-import com.zhongshu.card.server.core.domain.org.Role;
 import com.zhongshu.card.server.core.domain.school.NoticeInfo;
 import com.zhongshu.card.server.core.domain.school.NoticeInfoView;
 import com.zhongshu.card.server.core.service.base.CommonService;
@@ -26,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
 
 import java.util.HashMap;
 import java.util.Map;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/SchoolUserServiceImpl.java

@@ -9,7 +9,6 @@ import com.zhongshu.card.client.ret.ResultContent;
 import com.zhongshu.card.client.ret.ResultMessage;
 import com.zhongshu.card.client.service.org.UserAccountService;
 import com.zhongshu.card.client.service.school.SchoolUserService;
-import com.zhongshu.card.client.utils.type.Sex;
 import com.zhongshu.card.client.utils.type.UserType;
 import com.zhongshu.card.server.core.dao.CardInfoDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/user/OperationLogsService.java

@@ -9,7 +9,6 @@ import com.zhongshu.card.client.utils.type.LogsLevel;
 import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.user.OperationLogsDao;
 import com.zhongshu.card.server.core.domain.operlog.OperationLogs;
-import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import com.zhongshu.card.server.core.util.DateUtils;