haotian/wenlvApp
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

产品管理--修改--获取资源位详情。

Browse Source
This commit is contained in:
haotianmingyue 2024-12-19 16:45:30 +08:00
parent a2bc0d00e6
commit 7ee75ff1ce
3 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysMarketController.java
View File

@ -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);

36
ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java
View File

@ -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---------------------------------
//
// }
//

10
ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/OrderInfoDto.java
View File

@ -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;
}
}