Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善订单页面

Browse Source
This commit is contained in:
huangdeliang
2020-10-03 22:05:36 +08:00
parent b1bb07a0da
commit f161f449ba
20 changed files with 529 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/CusUserPostController.java Normal file
View File

@ -0,0 +1,33 @@
package com.ruoyi.web.controller.custom;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.custom.domain.CusUserPost;
import com.ruoyi.custom.service.ICusUserPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 销售订单Controller
*
* @author wonder
* @date 2020-09-24
*/
@RestController
@RequestMapping("/custom/post")
public class CusUserPostController extends BaseController {
@Autowired
private ICusUserPostService cusUserPostService;
@GetMapping("/options")
public AjaxResult getOptions() {
AjaxResult ajax = AjaxResult.success();
List<CusUserPost> userPosts = cusUserPostService.selectAllCusUserPost();
ajax.put(AjaxResult.DATA_TAG, userPosts);
return ajax;
}
}

75
ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysOrderController.java
View File

@ -1,13 +1,10 @@
package com.ruoyi.web.controller.custom;
import java.util.ArrayList;
import java.util.List;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.custom.UserPostOption;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,12 +37,11 @@ public class SysOrderController extends BaseController {
@Autowired
private ISysOrderService sysOrderService;
@Autowired
private ISysPostService postService;
@Autowired
private ISysUserService userService;
@Autowired
private ISysDictDataService dictDataService;
/**
* 查询销售订单列表
@ -54,8 +50,28 @@ public class SysOrderController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(SysOrder sysOrder) {
startPage();
// List<SysUser> users = userService.selectUserList();
List<SysOrder> list = sysOrderService.selectSysOrderList(sysOrder);
List<SysUser> userList = userService.selectAllUser();
for (SysOrder order : list) {
for (SysUser user : userList) {
if (user.getUserId().equals(order.getPreSaleId())) {
order.setPreSale(user.getNickName());
} else if (user.getUserId().equals(order.getAfterSaleId())) {
order.setAfterSale(user.getNickName());
} else if (user.getUserId().equals(order.getNutritionistId())) {
order.setNutritionist(user.getNickName());
} else if (user.getUserId().equals(order.getNutriAssisId())) {
order.setNutriAssis(user.getNickName());
} else if (user.getUserId().equals(order.getOperatorId())) {
order.setOperator(user.getNickName());
} else if (user.getUserId().equals(order.getPlannerId())) {
order.setPlanner(user.getNickName());
} else if (user.getUserId().equals(order.getPlannerAssisId())) {
order.setPlannerAssis(user.getNickName());
}
}
}
return getDataTable(list);
}
@ -68,6 +84,27 @@ public class SysOrderController extends BaseController {
@GetMapping("/export")
public AjaxResult export(SysOrder sysOrder) {
List<SysOrder> list = sysOrderService.selectSysOrderList(sysOrder);
List<SysUser> userList = userService.selectAllUser();
for (SysOrder order : list) {
for (SysUser user : userList) {
if (user.getUserId().equals(order.getPreSaleId())) {
order.setPreSale(user.getNickName());
} else if (user.getUserId().equals(order.getAfterSaleId())) {
order.setAfterSale(user.getNickName());
} else if (user.getUserId().equals(order.getNutritionistId())) {
order.setNutritionist(user.getNickName());
} else if (user.getUserId().equals(order.getNutriAssisId())) {
order.setNutriAssis(user.getNickName());
} else if (user.getUserId().equals(order.getOperatorId())) {
order.setOperator(user.getNickName());
} else if (user.getUserId().equals(order.getPlannerId())) {
order.setPlanner(user.getNickName());
} else if (user.getUserId().equals(order.getPlannerAssisId())) {
order.setPlannerAssis(user.getNickName());
}
}
}
ExcelUtil<SysOrder> util = new ExcelUtil<SysOrder>(SysOrder.class);
return util.exportExcel(list, "order");
}
@ -111,25 +148,5 @@ public class SysOrderController extends BaseController {
return toAjax(sysOrderService.deleteSysOrderByIds(orderIds));
}
@GetMapping("/getOptions")
public AjaxResult getOptions() {
AjaxResult ajax = AjaxResult.success();
List<SysUserPost> userPosts = postService.selectUserPostAll();
List<UserPostOption> userPostOptions = new ArrayList<>();
for (SysUserPost userPost : userPosts) {
SysPost post = postService.selectPostById(userPost.getPostId());
SysUser user = userService.selectUserById(userPost.getUserId());
UserPostOption userPostOption = new UserPostOption();
userPostOption.setPostCode(post.getPostCode());
userPostOption.setUserId(userPost.getUserId());
userPostOption.setUserName(user.getNickName());
userPostOptions.add(userPostOption);
}
ajax.put(AjaxResult.DATA_TAG, userPostOptions);
return ajax;
}
}

4
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -9,8 +9,8 @@ spring:
# url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# password: wonderdb
# url: jdbc:mysql://47.97.194.44:3306/long_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://localhost:3306/long_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://47.97.194.44:3306/long_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://localhost:3306/long_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
password: 9gPUnV$#2s/j(7_(
username: root
# 从库数据源

4
ruoyi-admin/src/main/resources/application.yml
View File

@ -9,8 +9,8 @@ ruoyi:
# 实例演示开关
demoEnabled: true
# 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
# profile: /Users/wonder/Documents/Workspaces/node/RuoYi-Vue/running/uploadPath
profile: /home/www/api/longShop/uploadPath
profile: /Users/wonder/Documents/Workspaces/java/RuoYi-Vue/running/uploadPath
# profile: /home/www/api/longShop/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证

4
ruoyi-admin/src/main/resources/logback.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<!-- <property name="log.path" value="/Users/wonder/Documents/Workspaces/node/RuoYi-Vue/running/logs" />-->
<property name="log.path" value="/home/www/api/longShop/logs" />
<property name="log.path" value="/Users/wonder/Documents/Workspaces/node/RuoYi-Vue/running/logs" />
<!-- <property name="log.path" value="/home/www/api/longShop/logs" />-->
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />