purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整价格屏蔽接口逻辑

Browse Source
This commit is contained in:
季圣华
2023-05-25 21:59:31 +08:00
parent 29ebf50585
commit 0f042d9562
3 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -806,6 +806,8 @@ public class DepotItemController {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
Long userId = userService.getUserId(request);
String priceLimit = userService.getRoleTypeByUserId(userId).getPriceLimit();
List<String> list = Tools.getLastMonths(6); List<String> list = Tools.getLastMonths(6);
JSONArray buyPriceList = new JSONArray(); JSONArray buyPriceList = new JSONArray();
for(String month: list) { for(String month: list) {
@@ -813,7 +815,7 @@ public class DepotItemController {
BigDecimal outPrice = depotItemService.inOrOutPrice("入库", "采购", month, roleType); BigDecimal outPrice = depotItemService.inOrOutPrice("入库", "采购", month, roleType);
BigDecimal inPrice = depotItemService.inOrOutPrice("出库", "采购退货", month, roleType); BigDecimal inPrice = depotItemService.inOrOutPrice("出库", "采购退货", month, roleType);
obj.put("x", month); obj.put("x", month);
obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "buy", "***", request)); obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "buy", priceLimit, "***", request));
buyPriceList.add(obj); buyPriceList.add(obj);
} }
map.put("buyPriceList", buyPriceList); map.put("buyPriceList", buyPriceList);
@@ -823,7 +825,7 @@ public class DepotItemController {
BigDecimal outPrice = depotItemService.inOrOutPrice("出库", "销售", month, roleType); BigDecimal outPrice = depotItemService.inOrOutPrice("出库", "销售", month, roleType);
BigDecimal inPrice = depotItemService.inOrOutPrice("入库", "销售退货", month, roleType); BigDecimal inPrice = depotItemService.inOrOutPrice("入库", "销售退货", month, roleType);
obj.put("x", month); obj.put("x", month);
obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "sale", "***", request)); obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "sale", priceLimit, "***", request));
salePriceList.add(obj); salePriceList.add(obj);
} }
map.put("salePriceList", salePriceList); map.put("salePriceList", salePriceList);
@@ -833,7 +835,7 @@ public class DepotItemController {
BigDecimal outPrice = depotItemService.inOrOutRetailPrice("出库", "零售", month, roleType); BigDecimal outPrice = depotItemService.inOrOutRetailPrice("出库", "零售", month, roleType);
BigDecimal inPrice = depotItemService.inOrOutRetailPrice("入库", "零售退货", month, roleType); BigDecimal inPrice = depotItemService.inOrOutRetailPrice("入库", "零售退货", month, roleType);
obj.put("x", month); obj.put("x", month);
obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "retail", "***", request)); obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "retail", priceLimit, "***", request));
retailPriceList.add(obj); retailPriceList.add(obj);
} }
map.put("retailPriceList", retailPriceList); map.put("retailPriceList", retailPriceList);

26
jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -1087,6 +1087,8 @@ public class DepotHeadService {
public Map<String, Object> getBuyAndSaleStatistics(String today, String monthFirstDay, String yesterdayBegin, String yesterdayEnd, public Map<String, Object> getBuyAndSaleStatistics(String today, String monthFirstDay, String yesterdayBegin, String yesterdayEnd,
String yearBegin, String yearEnd, String roleType, HttpServletRequest request) throws Exception { String yearBegin, String yearEnd, String roleType, HttpServletRequest request) throws Exception {
Long userId = userService.getUserId(request);
String priceLimit = userService.getRoleTypeByUserId(userId).getPriceLimit();
String [] creatorArray = getCreatorArray(roleType); String [] creatorArray = getCreatorArray(roleType);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
//今日 //今日
@@ -1141,18 +1143,18 @@ public class DepotHeadService {
yearBegin, yearEnd, creatorArray); //今年零售出库 yearBegin, yearEnd, creatorArray); //今年零售出库
BigDecimal yearRetailSaleBack = getBuyAndSaleRetailStatistics("入库", "零售退货", BigDecimal yearRetailSaleBack = getBuyAndSaleRetailStatistics("入库", "零售退货",
yearBegin, yearEnd, creatorArray); //今年零售退货 yearBegin, yearEnd, creatorArray); //今年零售退货
map.put("todayBuy", roleService.parsePriceByLimit(todayBuy.subtract(todayBuyBack), "buy", "***", request)); map.put("todayBuy", roleService.parseHomePriceByLimit(todayBuy.subtract(todayBuyBack), "buy", priceLimit, "***", request));
map.put("todaySale", roleService.parsePriceByLimit(todaySale.subtract(todaySaleBack), "sale", "***", request)); map.put("todaySale", roleService.parseHomePriceByLimit(todaySale.subtract(todaySaleBack), "sale", priceLimit, "***", request));
map.put("todayRetailSale", roleService.parsePriceByLimit(todayRetailSale.subtract(todayRetailSaleBack), "retail", "***", request)); map.put("todayRetailSale", roleService.parseHomePriceByLimit(todayRetailSale.subtract(todayRetailSaleBack), "retail", priceLimit, "***", request));
map.put("monthBuy", roleService.parsePriceByLimit(monthBuy.subtract(monthBuyBack), "buy", "***", request)); map.put("monthBuy", roleService.parseHomePriceByLimit(monthBuy.subtract(monthBuyBack), "buy", priceLimit, "***", request));
map.put("monthSale", roleService.parsePriceByLimit(monthSale.subtract(monthSaleBack), "sale", "***", request)); map.put("monthSale", roleService.parseHomePriceByLimit(monthSale.subtract(monthSaleBack), "sale", priceLimit, "***", request));
map.put("monthRetailSale", roleService.parsePriceByLimit(monthRetailSale.subtract(monthRetailSaleBack), "retail", "***", request)); map.put("monthRetailSale", roleService.parseHomePriceByLimit(monthRetailSale.subtract(monthRetailSaleBack), "retail", priceLimit, "***", request));
map.put("yesterdayBuy", roleService.parsePriceByLimit(yesterdayBuy.subtract(yesterdayBuyBack), "buy", "***", request)); map.put("yesterdayBuy", roleService.parseHomePriceByLimit(yesterdayBuy.subtract(yesterdayBuyBack), "buy", priceLimit, "***", request));
map.put("yesterdaySale", roleService.parsePriceByLimit(yesterdaySale.subtract(yesterdaySaleBack), "sale", "***", request)); map.put("yesterdaySale", roleService.parseHomePriceByLimit(yesterdaySale.subtract(yesterdaySaleBack), "sale", priceLimit, "***", request));
map.put("yesterdayRetailSale", roleService.parsePriceByLimit(yesterdayRetailSale.subtract(yesterdayRetailSaleBack), "retail", "***", request)); map.put("yesterdayRetailSale", roleService.parseHomePriceByLimit(yesterdayRetailSale.subtract(yesterdayRetailSaleBack), "retail", priceLimit, "***", request));
map.put("yearBuy", roleService.parsePriceByLimit(yearBuy.subtract(yearBuyBack), "buy", "***", request)); map.put("yearBuy", roleService.parseHomePriceByLimit(yearBuy.subtract(yearBuyBack), "buy", priceLimit, "***", request));
map.put("yearSale", roleService.parsePriceByLimit(yearSale.subtract(yearSaleBack), "sale", "***", request)); map.put("yearSale", roleService.parseHomePriceByLimit(yearSale.subtract(yearSaleBack), "sale", priceLimit, "***", request));
map.put("yearRetailSale", roleService.parsePriceByLimit(yearRetailSale.subtract(yearRetailSaleBack), "retail", "***", request)); map.put("yearRetailSale", roleService.parseHomePriceByLimit(yearRetailSale.subtract(yearRetailSaleBack), "retail", priceLimit, "***", request));
return map; return map;
} }

45
jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java
View File

@@ -82,9 +82,13 @@ public class RoleService {
for(RoleEx roleEx: list) { for(RoleEx roleEx: list) {
String priceLimit = roleEx.getPriceLimit(); String priceLimit = roleEx.getPriceLimit();
if(StringUtil.isNotEmpty(priceLimit)) { if(StringUtil.isNotEmpty(priceLimit)) {
String priceLimitStr = priceLimit.replace("1", "屏蔽采购价") String priceLimitStr = priceLimit
.replace("2", "屏蔽零售价") .replace("1", "屏蔽首页采购价")
.replace("3", "屏蔽销售价"); .replace("2", "屏蔽首页零售价")
.replace("3", "屏蔽首页销售价")
.replace("4", "屏蔽单据采购价")
.replace("5", "屏蔽单据零售价")
.replace("6", "屏蔽单据销售价");
roleEx.setPriceLimitStr(priceLimitStr); roleEx.setPriceLimitStr(priceLimitStr);
} }
} }
@@ -219,14 +223,12 @@ public class RoleService {
} }
/** /**
* 根据权限进行屏蔽价格 * 根据权限进行屏蔽价格-首页
* @param price * @param price
* @param type * @param type
* @return * @return
*/ */
public Object parsePriceByLimit(BigDecimal price, String type, String emptyInfo, HttpServletRequest request) throws Exception { public Object parseHomePriceByLimit(BigDecimal price, String type, String priceLimit, String emptyInfo, HttpServletRequest request) throws Exception {
Long userId = userService.getUserId(request);
String priceLimit = userService.getRoleTypeByUserId(userId).getPriceLimit();
if(StringUtil.isNotEmpty(priceLimit)) { if(StringUtil.isNotEmpty(priceLimit)) {
if("buy".equals(type) && priceLimit.contains("1")) { if("buy".equals(type) && priceLimit.contains("1")) {
return emptyInfo; return emptyInfo;
@@ -252,19 +254,42 @@ public class RoleService {
*/ */
public BigDecimal parseBillPriceByLimit(BigDecimal price, String billCategory, String priceLimit, HttpServletRequest request) throws Exception { public BigDecimal parseBillPriceByLimit(BigDecimal price, String billCategory, String priceLimit, HttpServletRequest request) throws Exception {
if(StringUtil.isNotEmpty(priceLimit)) { if(StringUtil.isNotEmpty(priceLimit)) {
if("buy".equals(billCategory) && priceLimit.contains("1")) { if("buy".equals(billCategory) && priceLimit.contains("4")) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
if("retail".equals(billCategory) && priceLimit.contains("2")) { if("retail".equals(billCategory) && priceLimit.contains("5")) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
if("sale".equals(billCategory) && priceLimit.contains("3")) { if("sale".equals(billCategory) && priceLimit.contains("6")) {
return BigDecimal.ZERO; return BigDecimal.ZERO;
} }
} }
return price; return price;
} }
/**
* 根据权限进行屏蔽价格-物料
* @param price
* @param type
* @return
*/
public Object parseMaterialPriceByLimit(BigDecimal price, String type, String emptyInfo, HttpServletRequest request) throws Exception {
Long userId = userService.getUserId(request);
String priceLimit = userService.getRoleTypeByUserId(userId).getPriceLimit();
if(StringUtil.isNotEmpty(priceLimit)) {
if("buy".equals(type) && priceLimit.contains("4")) {
return emptyInfo;
}
if("retail".equals(type) && priceLimit.contains("5")) {
return emptyInfo;
}
if("sale".equals(type) && priceLimit.contains("6")) {
return emptyInfo;
}
}
return price;
}
public String getCurrentPriceLimit(HttpServletRequest request) throws Exception { public String getCurrentPriceLimit(HttpServletRequest request) throws Exception {
Long userId = userService.getUserId(request); Long userId = userService.getUserId(request);
return userService.getRoleTypeByUserId(userId).getPriceLimit(); return userService.getRoleTypeByUserId(userId).getPriceLimit();