feta:正式的正元参数

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java

@@ -8,7 +8,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.fill.FillConfig;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
@@ -24,7 +23,6 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml

@@ -44,12 +44,20 @@ oauth2:
 # 正元智慧
 # https://gwyc.zj.gov.cn/API/%E7%9C%81%E5%B9%B3%E5%8F%B0API%E5%AF%B9%E6%8E%A5%E6%8E%A5%E5%8F%A3.html
 zy:
-  base-url: http://60.191.37.212:18079
-  app-id: 689C8D6F5059A6F85B8BE45A49001ACB
-  app-secret: BD21DA0DEB8F0FC43246B0BD2FCAE6FF
+  # base-url: http://60.191.37.212:18079
+  # 测试1
+  # app-id: 689C8D6F5059A6F85B8BE45A49001ACB
+  # app-secret: BD21DA0DEB8F0FC43246B0BD2FCAE6FF
+
+  # 测试2
   # app-id: FC455B0A788E334AC08FB3E1D8385C75
   # app-secret: E9131D0BCC9054808675DA1E2E199023
 
+  # 正式
+  base-url: http://10.146.63.216:8080
+  app-id: 0BBF0D9A7F1B4BD5280E59197E259AC6
+  app-secret: 434752786ACBB37214F6617CC37AD0E9
+
 
   self-base-url: http://60.191.37.212:18079
   self-app-id: xA5jF2vX4zO5mQ8tR9yE7rC7iI0fK0kI

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java

@@ -37,6 +37,7 @@ public interface WalletManageMapper extends PjcloudBaseMapper<WalletManageEntity
                         ObjectUtil.isNotEmpty(dto.getCreateTimeList()) ? dto.getCreateTimeList()[1] : null
                 )
                 .orderByDesc(WalletManageEntity::getCreateTime)
+                .orderByDesc(WalletManageEntity::getUserId)
                 .orderByDesc(WalletManageEntity::getWalletTypeId);
         if (ObjectUtil.isNotEmpty(dto.getIsInclude())) {
             if (dto.getIsInclude()) {

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java

@@ -283,7 +283,7 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
             List<WalletManageBalanceVo> itemList = baseMapper.selectBalance(dto);
             if (ObjectUtil.isEmpty(itemList)) continue;
             for (WalletManageBalanceVo j : itemList) {
-                j.setWalletTypeName(i.getName());
+                // j.setWalletTypeName(i.getName());
                 walletPage.getRecords().stream().filter(v -> ObjectUtil.equals(v.getUserId(), j.getUserId())).findFirst().ifPresent(v -> {
                     if (ObjectUtil.isNotEmpty(j.getBalance())) {
                         v.setBalance(j.getBalance());