From 5d0d2f006fc61eaf910620a04850a3475e7a1165 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 26 Nov 2020 11:25:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=A2=E5=8D=95=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/custom/SysOrderController.java | 86 ++++++++++--------- 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java index 385f8777d..a326d3c4b 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java @@ -1,33 +1,23 @@ package com.stdiet.web.controller.custom; +import com.stdiet.common.annotation.Log; +import com.stdiet.common.core.domain.AjaxResult; +import com.stdiet.common.core.domain.entity.SysUser; +import com.stdiet.common.enums.BusinessType; +import com.stdiet.common.utils.poi.ExcelUtil; +import com.stdiet.custom.controller.OrderBaseController; +import com.stdiet.custom.domain.SysOrder; +import com.stdiet.custom.page.OrderTableDataInfo; +import com.stdiet.custom.service.ISysOrderService; +import com.stdiet.system.service.ISysDictDataService; +import com.stdiet.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + import java.math.BigDecimal; import java.util.List; -import com.stdiet.common.core.domain.entity.SysDictData; -import com.stdiet.common.core.domain.entity.SysUser; -import com.stdiet.custom.controller.OrderBaseController; -import com.stdiet.custom.page.OrderTableDataInfo; -import com.stdiet.system.service.ISysDictDataService; -import com.stdiet.system.service.ISysUserService; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.stdiet.common.annotation.Log; -import com.stdiet.common.core.controller.BaseController; -import com.stdiet.common.core.domain.AjaxResult; -import com.stdiet.common.enums.BusinessType; -import com.stdiet.custom.domain.SysOrder; -import com.stdiet.custom.service.ISysOrderService; -import com.stdiet.common.utils.poi.ExcelUtil; -import com.stdiet.common.core.page.TableDataInfo; - /** * 销售订单Controller * @@ -56,7 +46,7 @@ public class SysOrderController extends OrderBaseController { List list = sysOrderService.selectSysOrderList(sysOrder); List userList = userService.selectAllUser(); BigDecimal totalAmount = sysOrderService.selectAllOrderAmount(sysOrder); - if(totalAmount == null) { + if (totalAmount == null) { totalAmount = new BigDecimal(0); } @@ -64,23 +54,30 @@ public class SysOrderController extends OrderBaseController { for (SysUser user : userList) { if (user.getUserId().equals(order.getPreSaleId())) { order.setPreSale(user.getNickName()); - } else if (user.getUserId().equals(order.getAfterSaleId())) { + } + if (user.getUserId().equals(order.getAfterSaleId())) { order.setAfterSale(user.getNickName()); - } else if (user.getUserId().equals(order.getNutritionistId())) { + } + if (user.getUserId().equals(order.getNutritionistId())) { order.setNutritionist(user.getNickName()); - } else if (user.getUserId().equals(order.getNutriAssisId())) { + } + if (user.getUserId().equals(order.getNutriAssisId())) { order.setNutriAssis(user.getNickName()); - } else if (user.getUserId().equals(order.getOperatorId())) { + } + if (user.getUserId().equals(order.getOperatorId())) { order.setOperator(user.getNickName()); - } else if (user.getUserId().equals(order.getPlannerId())) { + } + if (user.getUserId().equals(order.getPlannerId())) { order.setPlanner(user.getNickName()); - } else if (user.getUserId().equals(order.getPlannerAssisId())) { + } + if (user.getUserId().equals(order.getPlannerAssisId())) { order.setPlannerAssis(user.getNickName()); - } else if (user.getUserId().equals(order.getOperatorAssisId())) { + } + if (user.getUserId().equals(order.getOperatorAssisId())) { order.setOperatorAssis(user.getNickName()); } } - if(order.getPhone() != null && !order.getPhone().equals("")) { + if (order.getPhone() != null && !order.getPhone().equals("")) { order.setPhone(order.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2")); } } @@ -102,19 +99,26 @@ public class SysOrderController extends OrderBaseController { for (SysUser user : userList) { if (user.getUserId().equals(order.getPreSaleId())) { order.setPreSale(user.getNickName()); - } else if (user.getUserId().equals(order.getAfterSaleId())) { + } + if (user.getUserId().equals(order.getAfterSaleId())) { order.setAfterSale(user.getNickName()); - } else if (user.getUserId().equals(order.getNutritionistId())) { + } + if (user.getUserId().equals(order.getNutritionistId())) { order.setNutritionist(user.getNickName()); - } else if (user.getUserId().equals(order.getNutriAssisId())) { + } + if (user.getUserId().equals(order.getNutriAssisId())) { order.setNutriAssis(user.getNickName()); - } else if (user.getUserId().equals(order.getOperatorId())) { + } + if (user.getUserId().equals(order.getOperatorId())) { order.setOperator(user.getNickName()); - } else if (user.getUserId().equals(order.getPlannerId())) { + } + if (user.getUserId().equals(order.getPlannerId())) { order.setPlanner(user.getNickName()); - } else if (user.getUserId().equals(order.getPlannerAssisId())) { + } + if (user.getUserId().equals(order.getPlannerAssisId())) { order.setPlannerAssis(user.getNickName()); - } else if (user.getUserId().equals(order.getOperatorAssisId())) { + } + if (user.getUserId().equals(order.getOperatorAssisId())) { order.setOperatorAssis(user.getNickName()); } }