wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改1

This commit is contained in:
wangshuai 2024-07-10 18:47:16 +08:00
parent fc5811117a
commit d31ad5cd38
8 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
expand/ert/manifest.json
View File

@ -1,6 +1,6 @@
{
"manifest_version": 2,
"name": "授权伴侣",
"name": "优势管家登录器",
"version": "1.0",
"content_security_policy": "script-src 'self'; object-src 'self';",
"description": "This is a sample Chrome extension.",

92
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java
View File

@ -1,45 +1,33 @@
package com.ruoyi.business.controller;
import com.ruoyi.business.domain.BusAgentInfo;
import com.ruoyi.business.domain.BusStoreInfo;
import com.ruoyi.business.service.IBusAgentInfoService;
import com.ruoyi.business.service.IBusStoreInfoService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.business.domain.BusIntegralRecord;
import com.ruoyi.business.domain.BusStoreInfo;
import com.ruoyi.business.service.IBusIntegralRecordService;
import com.ruoyi.business.service.IBusStoreInfoService;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysLogininforService;
import com.ruoyi.system.service.ISysUserService;
import io.swagger.models.auth.In;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
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.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.business.domain.BusAgentInfo;
import com.ruoyi.business.service.IBusAgentInfoService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 代理管理Controller
@ -49,8 +37,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
*/
@RestController
@RequestMapping("/system/info")
public class BusAgentInfoController extends BaseController
{
public class BusAgentInfoController extends BaseController {
@Autowired
private IBusAgentInfoService busAgentInfoService;
@Autowired
@ -59,18 +46,19 @@ public class BusAgentInfoController extends BaseController
private ISysUserService iSysUserService;
@Autowired
private ISysLogininforService iSysLogininforService;
/**
* 查询代理管理列表
*/
// @PreAuthorize("@ss.hasPermi('system:info:list')")
@GetMapping("/list")
public TableDataInfo list(BusAgentInfo busAgentInfo)
{
public TableDataInfo list(BusAgentInfo busAgentInfo) {
startPage();
LoginUser user = SecurityUtils.getLoginUser();
// if(!"admin".equals(user.getUsername())){
// busAgentInfo.setSuperiorAgentCode(user.getUserId());
// }
busAgentInfo.setSuperiorAgentCode(user.getUserId());
List<BusAgentInfo> list = busAgentInfoService.selectBusAgentInfoList(busAgentInfo);
List<BusAgentInfo> listData = list.stream().map(bean -> {
BusStoreInfo busStoreInfo = new BusStoreInfo();
@ -111,8 +99,7 @@ public class BusAgentInfoController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:info:export')")
@Log(title = "代理管理", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BusAgentInfo busAgentInfo)
{
public void export(HttpServletResponse response, BusAgentInfo busAgentInfo) {
List<BusAgentInfo> list = busAgentInfoService.selectBusAgentInfoList(busAgentInfo);
ExcelUtil<BusAgentInfo> util = new ExcelUtil<BusAgentInfo>(BusAgentInfo.class);
util.exportExcel(response, list, "代理管理数据");
@ -121,10 +108,9 @@ public class BusAgentInfoController extends BaseController
/**
* 获取代理管理详细信息
*/
@PreAuthorize("@ss.hasPermi('system:info:query')")
// @PreAuthorize("@ss.hasPermi('system:info:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(busAgentInfoService.selectBusAgentInfoById(id));
}
@ -134,8 +120,7 @@ public class BusAgentInfoController extends BaseController
// @PreAuthorize("@ss.hasPermi('system:info:add')")
@Log(title = "代理管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody BusAgentInfo busAgentInfo)
{
public AjaxResult add(@RequestBody BusAgentInfo busAgentInfo) {
LoginUser loginUser = SecurityUtils.getLoginUser();
// 1级代理角色对应部门 insertList
return toAjax(busAgentInfoService.insertAgentInfo(loginUser, busAgentInfo));
@ -144,13 +129,19 @@ public class BusAgentInfoController extends BaseController
/**
* 修改代理管理
*/
@PreAuthorize("@ss.hasPermi('system:info:edit')")
// @PreAuthorize("@ss.hasPermi('system:info:edit')")
@Log(title = "代理管理", businessType = BusinessType.UPDATE)
@PutMapping
@Transactional
public AjaxResult edit(@RequestBody BusAgentInfo busAgentInfo)
{
public AjaxResult edit(@RequestBody BusAgentInfo busAgentInfo) {
LoginUser user = SecurityUtils.getLoginUser();
BusAgentInfo busAgentInfo1 = busAgentInfoService.selectBusAgentInfoById(user.getUserId());
if (user.getUserId() == 1) {
return toAjax(busAgentInfoService.updateAgentInfo(busAgentInfo));
} else if (user.getUserId() != 1 && busAgentInfo1.getAiDurationBalance() >= Integer.valueOf(busAgentInfo.getAiDurationBalance1())) {
return toAjax(busAgentInfoService.updateAgentInfo(busAgentInfo));
}
throw new ServiceException("账分余额不足！请联系管理员充值。");
}
/**
@ -159,8 +150,7 @@ public class BusAgentInfoController extends BaseController
@PreAuthorize("@ss.hasPermi('system:info:remove')")
@Log(title = "代理管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(busAgentInfoService.deleteBusAgentInfoByIds(ids));
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java
View File

@ -96,7 +96,7 @@ public class BusSaleInfoController extends BaseController
/**
* 导出店铺归属-销售人员统计列表
*/
@PreAuthorize("@ss.hasPermi('business:sale:export')")
// @PreAuthorize("@ss.hasPermi('business:sale:export')")
@Log(title = "店铺归属-销售人员统计", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, BusSaleInfo busSaleInfo)
@ -109,7 +109,7 @@ public class BusSaleInfoController extends BaseController
/**
* 获取店铺归属-销售人员统计详细信息
*/
@PreAuthorize("@ss.hasPermi('business:sale:query')")
// @PreAuthorize("@ss.hasPermi('business:sale:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{

13
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
View File

@ -14,6 +14,7 @@ import com.ruoyi.business.service.IBusStoreInfoService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
@ -95,6 +96,7 @@ public class BusStoreInfoController extends BaseController {
// if (!"admin".equals(user.getUsername())) {
// busStoreInfo.setBindUser(user.getUsername());
// }
busStoreInfo.setBindId(user.getUserId());
List<BusStoreInfo> list = busStoreInfoService.selectBusStoreInfoList(busStoreInfo);
List<RespBusStoreInfo> tableList = list.stream()
.map(busStoreInfo1 -> {
@ -122,6 +124,12 @@ public class BusStoreInfoController extends BaseController {
String today = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
List<BusReturnVisitInfo> lll = iBusReturnVisitInfoService.selectBusReturnVisitInfoListByDate(busStoreInfo1.getStoreCode(),today);
info.setTodayReturnVisitNum(lll.size());
BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo();
busStoreConfigInfo.setStoreCode(busStoreInfo1.getStoreCode());
List<BusStoreConfigInfo> list1 = iBusStoreConfigInfoService.selectBusStoreConfigInfoList(busStoreConfigInfo);
if(list1.size() == 1){
info.setReturnVisitUserRange(list1.get(0).getMinOrderNum()+"~"+list1.get(0).getMaxOrderNum());
}
return info;
})
.collect(Collectors.toList());
@ -154,6 +162,11 @@ public class BusStoreInfoController extends BaseController {
@Log(title = "自配送、删除状态", businessType = BusinessType.UPDATE)
@PutMapping("changeSelfDeliveryStatus")
public AjaxResult changeSelfDeliveryStatus(@RequestBody BusStoreInfo busStoreInfo1) {
if("1".equals(busStoreInfo1.getReturnVisitStatus())){
if("2".equals(busStoreInfo1.getGrantStatus())){
throw new ServiceException("请先授权登录！");
}
}
BusStoreInfo busStoreInfo = new BusStoreInfo();
busStoreInfo.setId(busStoreInfo1.getId());
busStoreInfo.setSelfDeliveryStatus(busStoreInfo1.getSelfDeliveryStatus());

2
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
View File

@ -343,7 +343,7 @@ public class MeituanServiceImpl implements IMeituanService {
} else if (info.contains("下单")){
orderInfo.setOrderCount(info.substring(info.indexOf("下单")+2,info.length()-1));
}
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
try {
orderInfo.setOrderTime(format.parse("2024-"+orderTimeFmt));
} catch (ParseException e) {

4
ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml
View File

@ -26,9 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="account != null and account != ''"> and account = #{account}</if>
<if test="platform != null and platform != ''"> and platform = #{platform}</if>
<if test="updateType != null and updateType != ''"> and update_type = #{updateType}</if>
<if test="integralUpdateNum != null "> and Integral_update_num = #{integralUpdateNum}</if>
<!-- <if test="integralUpdateNum != null "> and Integral_update_num = #{integralUpdateNum}</if>-->
<if test="integralUpdateTime != null "> and Integral_update_time = #{integralUpdateTime}</if>
<if test="integralBalance != null "> and Integral_balance = #{integralBalance}</if>
<!-- <if test="integralBalance != null "> and Integral_balance = #{integralBalance}</if>-->
<if test="agentRemark != null and agentRemark != ''"> and agent_remark = #{agentRemark}</if>
</where>
</select>

2
ruoyi-ui/src/views/market/self/index.vue
View File

@ -190,14 +190,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:role:edit']"
>配置</el-button>
<el-button v-if="scope.row.returnVisitStatus !== 1"
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:role:remove']"
>删除</el-button>
<el-button
size="mini"

3
ruoyi-ui/src/views/statistics/shop/index.vue
View File

@ -389,8 +389,7 @@ export default {
storeName: undefined,
saleBindId: undefined,
grantStatus: undefined,
returnVisitStatus: undefined,
selfDeliveryStatus: 1
returnVisitStatus: undefined
},
saleList: [],
timeRange: undefined,