10-16 查询收款订单，状态码补充

src/main/java/com/example/demo/controller/cash/CashCollectionController.java

@@ -13,6 +13,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -39,9 +40,13 @@ public class CashCollectionController {
 
     //根据精网号获取姓名和地区
     @PostMapping("/getNameAndMarket")
-    public User getNameAndMarket(@RequestBody Integer jwcode) {
-            return cashCollectionService.getNameAndMarket(jwcode);
+    public Result getNameAndMarket(@RequestBody Integer jwcode) {
+        try {
 
+            return Result.success(cashCollectionService.getNameAndMarket(jwcode));
+        } catch (Exception e) {
+            return Result.error(e.getMessage());
+        }
     }
     //获取收款活动列表
     @PostMapping("/getActivityList")
@@ -81,22 +86,30 @@ public class CashCollectionController {
     }
     //多条件查询收款订单列表
     @PostMapping("/selectCollection")
-    public PageInfo<CashCollection> selectCollection(
-            @RequestBody Page  page) throws Exception{
-        Integer pageNum = page.getPageNum();
-        Integer pageSize = page.getPageSize();
-        CashCollection cashCollection = page.getCashCollection();
-        //解token权限
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-        String token = request.getHeader("token");
-        Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
-        if (admin != null) {
+    public  Result selcetAll(@RequestBody Page page){
+        try {
+            if (ObjectUtils.isEmpty(page.getPageNum())) {
+                return Result.error("页码数为空！");
+            }
+            if (ObjectUtils.isEmpty(page.getPageSize())) {
+                return Result.error("页大小为空！");
+            } else {
+            //解token权限
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            String token = request.getHeader("token");
+            Admin admin = (Admin) JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class);
+            if (admin != null) {
             List<String> list = Arrays.asList(admin.getMarkets().split(","));
-            cashCollection.setMarkets(list);
+            page.getCashCollection().setMarkets(list);}
+             else{
+                    return Result.error("角色为空");
+                }
 
-        }
-        return cashCollectionService.selectCollection(pageNum, pageSize, cashCollection);
-    }
+        return Result.success(cashCollectionService.selectCollection(page.getPageNum(), page.getPageSize(),page.getCashCollection()));
+    }} catch (Exception e) {
+            return Result.error(e.getMessage());
+
+        }}
     //补全手续费等
     @PostMapping("/complete")
     public Result complete(@RequestBody CashRecord cashRecord) {

src/main/java/com/example/demo/controller/coin/RechargeController.java

@@ -63,7 +63,7 @@ public class RechargeController {
                 return Result.success(rechargeService.selectAll(page.getPageNum(), page.getPageSize(),page.getRechargeUser()));
             }
         } catch (Exception e) {
-            return Result.error("请检查筛选数据的格式");
+            return Result.error(e.getMessage());
 
         }
 

src/main/java/com/example/demo/domain/vo/coin/Page.java

@@ -44,4 +44,5 @@ public class Page {
     private HistoryRecord historyRecord; //历史记录
     private CashCollection cashCollection;  //现金收款
     private CashRecordDone cashRecordDone;
+
 }

src/main/resources/mapper/WorkBenchMapper.xml

@@ -178,7 +178,7 @@
                SUM(CASE WHEN r.id = 6 THEN cr.received_amount ELSE 0 END) AS cad,
                SUM(CASE WHEN r.id = 7 THEN cr.received_amount ELSE 0 END) AS vdn,
                SUM(CASE WHEN r.id = 8 THEN cr.received_amount ELSE 0 END) AS krw,
-               NULL                                  AS totalSGD   -- 后续再用汇率折算
+        ROUND( SUM(cr.received_amount * r.num), 2) AS totalSGD
         FROM cash_record cr
                  JOIN market m ON cr.received_market = m.id
                  JOIN rate   r ON cr.received_currency = r.id