zyy/quote_price
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改日志

Browse Source
This commit is contained in:
zhuyiyi
2026-05-20 17:16:51 +08:00
parent 0d6813c501
commit 99067b19d1
99 changed files with 279 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/lingtao/net/controller/ProductController.java
+2 -2
View File
@@ -248,8 +248,8 @@ public class ProductController {
product.setKindValue(toumingKind);
}
// 插入操作日志
String log = quoteLogService.log(product, request, proList);
if ("登陆失效".equals(log)) {
// String log = quoteLogService.log(product, request, proList);
if (user == null) {
return Msg.fail("登录信息失效~请刷新页面！");
}
src/main/java/lingtao/net/controller/QuoteLogController.java
+26 -18
View File
@@ -2,6 +2,7 @@ package lingtao.net.controller;
import java.util.List;
import lingtao.net.bean.Msg;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -13,27 +14,34 @@ import com.github.pagehelper.PageInfo;
import lingtao.net.bean.QuoteLog;
import lingtao.net.service.QuoteLogService;
import javax.servlet.http.HttpServletRequest;
@RestController
public class QuoteLogController {
@Autowired
private QuoteLogService quoteLogService;
@Autowired
private QuoteLogService quoteLogService;
/**
* 获取操作日志列表
*
* @param page
* @param limit
* @param quoteLog
* @return
*/
@RequestMapping("/getQuoteLog")
public PageInfo<QuoteLog> logList(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit", defaultValue = "10") Integer limit, QuoteLog quoteLog) {
PageHelper.startPage(page, limit);
List<QuoteLog> logList = quoteLogService.quoteLogs(quoteLog);
PageInfo<QuoteLog> pageInfo = new PageInfo<QuoteLog>(logList);
return pageInfo;
}
/**
* 获取操作日志列表
*
* @param page
* @param limit
* @param quoteLog
* @return
*/
@RequestMapping("/getQuoteLog")
public PageInfo<QuoteLog> logList(@RequestParam(value = "page", defaultValue = "1") Integer page,
@RequestParam(value = "limit", defaultValue = "10") Integer limit, QuoteLog quoteLog) {
PageHelper.startPage(page, limit);
List<QuoteLog> logList = quoteLogService.quoteLogs(quoteLog);
PageInfo<QuoteLog> pageInfo = new PageInfo<QuoteLog>(logList);
return pageInfo;
}
@RequestMapping("/addQuoteLog")
public Msg addQuoteLog(QuoteLog quoteLog, HttpServletRequest request) {
String log = quoteLogService.log(quoteLog, request);
return Msg.success();
}
}
src/main/java/lingtao/net/service/ProductService.java
+17
View File
@@ -2633,6 +2633,23 @@ public class ProductService {
}
apprise = product.getPrice();
}
if ("宠物转印贴".equals(dto.getKind())) {
for (Product product : priceList) {
product.setPrice(Math.ceil(product.getPrice() == 50 ? product.getPrice() : product.getPrice() * 1.3));
double number_price = 0;
double number_price_base = 3;
for (int i = 0; i < number; i++) {
number_price += Math.max(1, number_price_base);
number_price_base--;
}
if ("宠物转印贴".equals(dto.getKind()) && craft_list.contains("内部裁切")) {
product.setPrice(Math.ceil(product.getPrice() + 5 * dto.getN_mq_num()));
}
product.setPrice(Math.ceil(product.getPrice() + number_price));
}
}
if (craft_list.contains("熨斗")) {
dto.setPo_number(dto.getPo_number() == null ? 1 : dto.getPo_number());
for (Product product : priceList) {
src/main/java/lingtao/net/service/QuoteLogService.java
+79
View File
@@ -247,4 +247,83 @@ public class QuoteLogService {
}
return null;
}
public String log(QuoteLog quoteLog, HttpServletRequest request) {
long startTime, endTime = 0;
startTime = System.currentTimeMillis();
SysUser user = (SysUser) request.getSession().getAttribute("USER_SESSION");
String remark_judge = quoteLog.getRemark();
if (user == null) {
return "登陆失效";
}
QuoteLog log = new QuoteLog();
log.setRemark(remark_judge);
log.setRealname(user.getRealname());
log.setUsername(user.getUsername());
log.setQuoteIp(IPUtils.getIpAddr(request));// 获取ip
log.setBrower(IPUtils.getBrowserName(request));// 获取浏览器名称
log.setOs(IPUtils.getOsName(request)); // 获取操作系统名称
log.setPrice((double) 0);
List<SysRole> allRoleNames = sysRoleService.getAllRoleName(null);
String roleName = "";
String[] split = user.getRole().split(",");
for (SysRole sysRole : allRoleNames) {
for (int i = 0; i < split.length; i++) {
if (split[i].equals(String.valueOf(sysRole.getRoleId()))) {
roleName += sysRole.getRoleName() + "、";
}
}
}
log.setShopname(roleName);
quoteLogMapper.insertSelective(log);
endTime = System.currentTimeMillis();
System.out.println("【insertSelective】使用的时间:" + (endTime - startTime));
long startTime2, endTime2 = 0;
startTime2 = System.currentTimeMillis();
boolean flag = false;
// 查询3分钟内自己报的数据
List<String> remarkJudgeData = quoteDataMapper.getQuoteDataByMinutes(user.getUsername());
endTime2 = System.currentTimeMillis();
System.out.println("【getQuoteDataByMinutes】使用的时间:" + (endTime2 - startTime2));
for (String remarkJudge : remarkJudgeData) {
if (remarkJudge.equals(remark_judge)) {
// 如果3分钟内报过相同数据
flag = true;
break;
}
}
// 插入数据（给客服数据新增用的）
String role = user.getRole();
// 客服报的且3分钟内没有同一个客户报的数据才插入
if (role.contains("999,") && !flag) {
QuoteData quoteData = new QuoteData();
quoteData.setUsername(user.getUsername());
quoteData.setRealname(user.getRealname());
quoteData.setPrice((double) 0);
quoteData.setRole(user.getRole());
// 默认都是没选择店铺
quoteData.setIsSelect("0");
// role = role.replace("999,", "").replace(",1049", "").replace(",1011", "");
// 规则:第一位客服，第二位主店铺
String shopname = role.substring(role.indexOf(",") + 1);
if (shopname.indexOf(",") != -1) {
shopname = shopname.substring(0, shopname.indexOf(","));
}
System.out.println(shopname);
quoteData.setShopname(shopname);
quoteData.setIsSelect("1");
// 除去【客服】只有一个店铺，所属店铺就是剩下这个店铺 切 选择状态改为已选择
// if (!role.contains(",")) {
// }
quoteData.setIsBuy("0");
quoteData.setIsBuyToDay("0");
quoteData.setRemark(remark_judge);
// 默认都是填写旺旺号
quoteData.setIsFillIn("1");
quoteDataMapper.addQuoteData(quoteData);
}
return null;
}
}