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

!206 修复合作方bug

Browse Source 
Merge pull request !206 from 德仔/develop
This commit is contained in:
德仔
2021-04-15 16:15:57 +08:00
committed by Gitee
parent 7ae95e8d96 8b21414371
commit 394524cbb3
4 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
View File

@ -3,6 +3,7 @@ package com.stdiet.web.controller.custom;
import com.stdiet.common.annotation.Log;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.common.core.domain.AjaxResult;
import com.stdiet.common.core.domain.entity.SysUser;
import com.stdiet.common.core.page.TableDataInfo;
import com.stdiet.common.enums.BusinessType;
import com.stdiet.common.utils.SecurityUtils;
@ -15,10 +16,10 @@ import com.stdiet.custom.service.ISysCustomerHealthyService;
import com.stdiet.custom.service.ISysCustomerPhysicalSignsService;
import com.stdiet.custom.service.ISysCustomerService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.SecurityConfig;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.List;
/**
@ -46,11 +47,16 @@ public class SysCustomerController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(SysCustomer sysCustomer) {
startPage();
String remark = SecurityUtils.getLoginUser().getUser().getRemark();
if (StringUtils.isNotEmpty(remark) && remark.contains("|") && sysCustomer.getChannelId() == null) {
sysCustomer.setChannels(remark.split("\\|"));
List<SysCustomer> list = new ArrayList<>();
if (SecurityUtils.getLoginUser().getUser().getRoles().get(0).getRoleKey().equals("partner")) {
String remark = SecurityUtils.getLoginUser().getUser().getRemark();
if (StringUtils.isEmpty(remark)) {
return getDataTable(list);
} else if (remark.contains("|") && sysCustomer.getChannelId() == null) {
sysCustomer.setChannels(remark.split("\\|"));
}
}
List<SysCustomer> list = sysCustomerService.selectSysCustomerList(sysCustomer);
list = sysCustomerService.selectSysCustomerList(sysCustomer);
if (list != null && list.size() > 0) {
for (SysCustomer sysCus : list) {
if (StringUtils.isNotEmpty(sysCus.getPhone())) {

14
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java
View File

@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.net.URLDecoder;
import java.util.ArrayList;
import java.util.List;
/**
@ -49,12 +50,17 @@ public class SysOrderController extends OrderBaseController {
public OrderTableDataInfo list(SysOrder sysOrder) {
startPage();
dealOrderType(sysOrder);
String remark = SecurityUtils.getLoginUser().getUser().getRemark();
if (StringUtils.isNotEmpty(remark) && remark.contains("|") && StringUtils.isEmpty(sysOrder.getAccount())) {
sysOrder.setAccRange(remark.split("\\|"));
List<SysOrder> list = new ArrayList<>();
if (SecurityUtils.getLoginUser().getUser().getRoles().get(0).getRoleKey().equals("partner")) {
String remark = SecurityUtils.getLoginUser().getUser().getRemark();
if (StringUtils.isEmpty(remark)) {
return getOrderDataTable(list, new BigDecimal(0));
} else if (remark.contains("|") && StringUtils.isEmpty(sysOrder.getAccount())) {
sysOrder.setAccRange(remark.split("\\|"));
}
}
List<SysOrder> list = sysOrderService.selectSysOrderList(sysOrder);
list = sysOrderService.selectSysOrderList(sysOrder);
List<SysUser> userList = userService.selectAllUser();
BigDecimal totalAmount = sysOrderService.selectAllOrderAmount(sysOrder);
if (totalAmount == null) {