更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/org/UpdateUserStateParam.java

@@ -4,6 +4,9 @@ import com.zhongshu.card.client.type.UserState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author TRX
  * @date 2024/6/6
@@ -11,6 +14,15 @@ import lombok.Data;
 @Data
 public class UpdateUserStateParam {
 
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "手机号码")
+    private String phone;
+
+    @Schema(description = "密码")
+    private String password;
+
     @Schema(description = "用户UserId")
     private String userId;
 
@@ -18,5 +30,11 @@ public class UpdateUserStateParam {
     private String oid;
 
     @Schema(description = "用户状态")
-    UserState userState;
+    private UserState state;
+
+    @Schema(description = "角色列表")
+    private List<String> roleIds = new ArrayList<>();
+
+    @Schema(description = "备注")
+    private String remark;
 }

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

@@ -1,10 +1,13 @@
 package com.zhongshu.card.server.core.dao.payment;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
+import com.zhongshu.card.client.type.RefundState;
 import com.zhongshu.card.server.core.dao.payment.extend.ExpenseFlowDaoExtend;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
 import com.zhongshu.card.server.core.domain.payment.RefundRecord;
 
+import java.util.List;
+
 /**
  * 订单退款Dao
  *
@@ -19,4 +22,5 @@ public interface RefundRecordDao extends MongoDao<RefundRecord> {
 
     RefundRecord findTopByRefundNo(String refundNo);
 
+    List<RefundRecord> findTop10ByRefundStateOrderByCreateTimeDesc(RefundState refundState);
 }

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

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.domain.payment;
 
 import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
+import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.client.type.RefundState;
 import com.zhongshu.card.client.type.payment.RefundMethodType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
@@ -40,6 +41,9 @@ public class RefundRecord extends SuperMain {
     @Schema(description = "退款状态")
     private RefundState refundState;
 
+    @Schema(description = "支付方式")
+    private PaymentType paymentType;
+
     @Schema(description = "退款方式")
     private RefundMethodType refundMethodType = RefundMethodType.BusRefund;
 

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

@@ -533,7 +533,9 @@ public class PayCallService extends SuperService {
         refundRecord.setRefundTime(System.currentTimeMillis());
         refundRecord.setRefundRemark(param.getRemark());
         refundRecord.setRefundNo(refundNo);
-
+        refundRecord.setProjectOid(entity.getProjectOid());
+        refundRecord.setPaymentType(entity.getPaymentType());
+        
         if (resultContent.isSuccess()) {
             entity.setIsRefund(Boolean.FALSE);
             entity.setRefundRemark(param.getRemark());

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

@@ -2,6 +2,7 @@ package com.zhongshu.card.server.core.service.payment;
 
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
+import com.wechat.pay.java.service.refund.model.Refund;
 import com.zhongshu.card.client.type.RefundState;
 import com.zhongshu.card.server.core.dao.payment.RefundRecordDao;
 import com.zhongshu.card.server.core.domain.payment.RefundRecord;
@@ -58,4 +59,14 @@ public class RefundRecordService extends SuperService {
         }
         return ResultContent.buildSuccess();
     }
+
+    /**
+     * 得到最近10条退款中的数据
+     *
+     * @return
+     */
+    public List<RefundRecord> getTop10RefundingRecord() {
+        return refundRecordDao.findTop10ByRefundStateOrderByCreateTimeDesc(RefundState.Refunding);
+    }
+
 }

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

@@ -34,6 +34,7 @@ import com.zhongshu.card.server.core.service.orgManager.OrganizationManagerServi
 import com.zhongshu.card.server.core.service.school.DictInfoServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;
 import com.zhongshu.card.server.core.util.CommonUtil;
+import com.zhongshu.card.server.core.util.ValidateResult;
 import com.zhongshu.card.server.core.util.ValidateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -154,7 +155,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
             userCountDao.save(userAccount);
         } else {
             // 编辑
-            BeanUtils.copyProperties(param, userAccount);
+            BeanUtils.copyPropertiesWithoutNull(param, userAccount);
             String realName = param.getRealName();
             if (StringUtils.isEmpty(realName)) {
                 realName = param.getName();
@@ -258,6 +259,37 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
      */
     @Override
     public ResultContent updateOrgUserState(UpdateUserStateParam param) {
+        if (StringUtils.isEmpty(param.getUserId())) {
+            // 新增加
+            if (StringUtils.isEmpty(param.getName())) {
+                return ResultContent.buildFail("name不能为空");
+            }
+            if (StringUtils.isEmpty(param.getPhone())) {
+                return ResultContent.buildFail("phone不能为空");
+            }
+            if (StringUtils.isEmpty(param.getPassword())) {
+                return ResultContent.buildFail("password不能为空");
+            }
+            ValidateResult validateResult = ValidateUtils.validatePassWord(param.getPassword());
+            if (!validateResult.isSuccess()) {
+                return ResultContent.buildFail(validateResult.getMsg());
+            }
+
+            // 初始基本用户信息
+            RegisterUserAccountParam userAccountParam = new RegisterUserAccountParam();
+            userAccountParam.setLoginName(param.getPhone());
+            userAccountParam.setPassword(param.getPassword());
+            userAccountParam.setPhone(param.getPhone());
+            userAccountParam.setName(param.getName());
+            ResultContent<String> userAccountContent = registerUserAccount(userAccountParam);
+            if (userAccountContent.isFailed()) {
+                return ResultContent.buildFail(userAccountContent.getMsg());
+            }
+            String userId = userAccountContent.getContent();
+            
+        } else {
+
+        }
         String userId = param.getUserId();
         String oid = param.getOid();
         if (StringUtils.isEmpty(oid)) {
@@ -277,7 +309,7 @@ public class UserAccountServiceImpl extends SuperService implements UserAccountS
 
         OrganizationUser organizationUser = organizationUserDao.findTopByOrganizationAndUser(organization, temp);
         if (ObjectUtils.isNotEmpty(organizationUser)) {
-            organizationUser.setState(param.getUserState());
+            organizationUser.setState(param.getState());
             organizationUserDao.save(organizationUser);
         }
         return ResultContent.buildSuccess();