From 7ee75ff1ce40a3cf42c3cae281ca54a84ee1bc44 Mon Sep 17 00:00:00 2001
From: haotianmingyue <2421912570@qq.com>
Date: Thu, 19 Dec 2024 16:45:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86--=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9--=E8=8E=B7=E5=8F=96=E8=B5=84=E6=BA=90=E4=BD=8D?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backstage/SysMarketController.java        |  1 +
 .../backstage/SysSourceController.java        | 36 ++++++++++++++-----
 .../ruoyi/system/domain/dto/OrderInfoDto.java | 10 ++++++
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java
index cb8c4edb..9821cf76 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java
@@ -137,6 +137,7 @@ public class SysMarketController extends BaseController {
                 orderInfoDto.setSource(orderInfoDto.getCity()+orderInfoDto.getScenic()+orderInfoDto.getPart()+orderInfoDto.getCoordinate());
                 orderInfoDto.setAvatar(orderListDto.getAvatar());
                 orderInfoDto.setWay(orderListDto.getWay());
+                orderInfoDto.setOrderId(orderListDto.getOrderId());
             }
 
             orderListDto.setOrderInfoList(orderInfoList);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java
index b5700fe0..a19bb5b0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java
@@ -305,9 +305,19 @@ public class SysSourceController extends BaseController {
         LocalDate startTime = sourceListDto.getStartTime();
         LocalDate endTime = sourceListDto.getEndTime();
 
+        System.out.println(startTime+" "+endTime);
+
         sourceListDto.setTime(sourceListDto.getStartTime() + "~" + sourceListDto.getEndTime());
 
-        long daysBetween = ChronoUnit.DAYS.between(startTime, endTime);
+        long daysBetween = 0L;
+
+        if(startTime!=null && endTime!=null){
+
+            daysBetween = ChronoUnit.DAYS.between(startTime, endTime);
+
+        }
+
+
 
 
 
@@ -318,12 +328,14 @@ public class SysSourceController extends BaseController {
         sourceListDto.setrDay(0L);
 
         // 价格
-        Map<String, String> price = GsonUtils.fromJson(sourceListDto.getPrice(), HashedMap.class);
+//        Map<String, String> price = GsonUtils.fromJson(sourceListDto.getPrice(), HashedMap.class);
 
         // 编号
         sourceListDto.setNumber(sourceListDto.getPart()+"区"+sourceListDto.getScale()+sourceListDto.getCoordinate());
 
-        sourceListDto.setPriceJson(price);
+        sourceListDto.setPriceList(GsonUtils.fromJson(sourceListDto.getPrice(), List.class));
+
+//        sourceListDto.setPriceJson(price);
 
 
         return success(sysSourceList);
@@ -376,7 +388,7 @@ public class SysSourceController extends BaseController {
 
     }
 
-//     修改默认价格和图片--------默认价格修改了---前端传什么参数呢??
+//     修改默认价格和图片--------默认价格修改
     @Transactional
     @Log(title = "产品管理--修改资源位默认价格", businessType = BusinessType.UPDATE)
     @PostMapping("/changeSourcePriceAndWork")
@@ -416,7 +428,16 @@ public class SysSourceController extends BaseController {
             // 更新数据库--价格信息
             sysScenicDefaultService.updateSysScenicDefault(sysScenicDefault);
 
-            //----------------------------------- 修改所有对应资源位的默认价格----------------------------------
+            //----------------------------------- 修改所有对应资源位的默认价格--source_status=0------------------------------------------
+            SysSource sysSource = new SysSource();
+            sysSource.setPart(price.getPart());
+            sysSource.setScenic(price.getScenic());
+            sysSource.setCity(price.getCity());
+            sysSource.setSourceStatus("0");
+            sysSource.setPrice(price.getPriceList().toString());
+
+
+            sysSourceService.updateSysSource(sysSource);
 
             // function
             //---------------------------------修改所有对应资源位的默认价格end-------------------------------------------------
@@ -442,10 +463,7 @@ public class SysSourceController extends BaseController {
 //            sysScenicDefaultService.updateSysScenicDefault(sysScenicDefault);
 //
 //
-//            // -------------------------修改没有出售的资源位的默认作品--还没写--------------------
-//
-//            // function
-//            //--------------------------修改默认作品-----end---------------------------------
+
 //
 //        }
 //
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java
index ed4f2da4..121dc917 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java
@@ -8,6 +8,8 @@ public class OrderInfoDto {
 
     private Long orderInfoId;
 
+    private Long orderId;
+
     private Long userId;
     private String nickName;
 
@@ -192,5 +194,13 @@ public class OrderInfoDto {
 		this.way = way;
 	}
 
+    public Long getOrderId() {
+		return orderId;
+	}
+
+    public void setOrderId(Long orderId) {
+		this.orderId = orderId;
+	}
+
 
 }