更新

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

@@ -11,6 +11,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -64,6 +65,16 @@ public class OrganizationUserModel extends SuperModel {
     @Schema(description = "姓名")
     private String name;
 
+    @Schema(description = "真实姓名")
+    private String realName;
+
+    public String getRealName() {
+        if (user != null) {
+            return user.getRealName();
+        }
+        return name;
+    }
+
     @Schema(description = "用户状态")
     private UserState state = UserState.Normal;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/hxz/HxzService.java

@@ -101,8 +101,8 @@ public class HxzService extends SuperService {
         stopWatch.stop();
 
         stopWatch.start("t3 支付");
-        // 支付
-        ResultContent<ExpenseFlow> resultContent = expenseFlowService.walletPay(expenseFlow);
+        // 订单支付
+        ResultContent<ExpenseFlow> resultContent = expenseFlowService.orderPay(expenseFlow);
         if (resultContent.isFailed()) {
             resultModel.setFailed(resultContent.getMsg());
             requestInfoService.addRequestInfo(param, resultModel);
@@ -155,8 +155,8 @@ public class HxzService extends SuperService {
         expenseFlow = createResult.getContent();
 
         if (expenseFlow.getPaymentType() == PaymentType.UserWallet) {
-            // 钱包支付
-            ResultContent<ExpenseFlow> resultContent = expenseFlowService.walletPay(expenseFlow);
+            // 订单支付
+            ResultContent<ExpenseFlow> resultContent = expenseFlowService.orderPay(expenseFlow);
             if (resultContent.isSuccess()) {
                 model.setSuccess();
                 model.setQrorder(expenseFlow.getOrderNo());

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

@@ -147,7 +147,7 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
 
         String deviceId = iotParam.getDeviceId();
         expenseFlow.setDeviceId(deviceId);
-        // 支付来源
+        // 支付来源  刷卡  二维码  刷脸
         expenseFlow.setOrderFromType(iotParam.getOrderFromType());
         expenseFlow.setParam(iotParam);
         expenseFlow.setPaymentDeviceType(PaymentDeviceType.HxzConsumTransactions);
@@ -159,13 +159,13 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
     }
 
     /**
-     * 钱包支付
+     * 订单支付
      *
      * @param entity
      * @return
      */
     @Transactional
-    public ResultContent<ExpenseFlow> walletPay(ExpenseFlow entity) {
+    public ResultContent<ExpenseFlow> orderPay(ExpenseFlow entity) {
         if (entity.getVerifyParamIsSuccess() == null || !entity.getVerifyParamIsSuccess()) {
             // 参数失败
             entity.setIsPaySuccess(Boolean.FALSE);
@@ -175,6 +175,8 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             return ResultContent.buildSuccess(entity);
         }
 
+        PaymentType paymentType = entity.getPaymentType();
+        // 调用支付中心
         CreateOrderParam param = new CreateOrderParam();
         param.setProjectOid(entity.getProjectOid());
         param.setUserId(entity.getUserId());
@@ -182,11 +184,12 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         param.setSchoolId(entity.getSchoolOid());
         param.setTotal(entity.getPayAmount());
         param.setOutTradeNo(entity.getPaymentNo());
-        param.setPaymentType(entity.getPaymentType());
-        param.setDescription("刷卡消费");
+        param.setPaymentType(paymentType);
+        String desc = "消费";
+        param.setDescription(desc);
 
         OperationLogsAddParam logsAddParam = initLog(entity.getUserId());
-        logsAddParam.setTitle("刷卡消费");
+        logsAddParam.setTitle(desc);
         logsAddParam.setDataId(entity.getPaymentNo());
         entity.setPayStartTime(System.currentTimeMillis());
         ResultContent content = orderPayFeignService.createAndPay(param);
@@ -335,8 +338,8 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
         entity.setPaymentType(paymentType);
         entity.setPaymentWay(paymentType.getRemark());
 
-        // 刷卡支付 并且钱包支付
-        if (paymentType == PaymentType.UserWallet && entity.getOrderFromType() == OrderFromType.Swipe) {
+        // 刷卡支付 并且钱包支付 paymentType == PaymentType.UserWallet &&
+        if (entity.getOrderFromType() == OrderFromType.Swipe) {
             CardInfo cardInfo = cardInfoDao.findByCode(entity.getCardNo());
             // 验证卡片
             if (ObjectUtils.isEmpty(cardInfo)) {