cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

移除无用VO及其其他,规范下文件名

Browse Source
This commit is contained in:
hupeng
2020-06-28 14:04:52 +08:00
parent f7a79714d5
commit 0b868c2f28
18 changed files with 16 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yshop-app/src/main/java/co/yixiang/modules/manage/dto/ChartDataDTO.java → yshop-app/src/main/java/co/yixiang/modules/manage/dto/ChartDataDto.java
View File

@ -5,12 +5,12 @@ import lombok.Data;
import java.io.Serializable;
/**
* @ClassName ChartDataDTO
* @ClassName ChartDataDto
* @Author hupeng <610796224@qq.com>
* @Date 2019/11/25
**/
@Data
public class ChartDataDTO implements Serializable {
public class ChartDataDto implements Serializable {
private Double num;
private String time;
}

20
yshop-app/src/main/java/co/yixiang/modules/manage/dto/OrderTimeDataDTO.java
View File

@ -1,20 +0,0 @@
//package co.yixiang.modules.manage.rest.dto;
//
//import lombok.Data;
//
//import java.io.Serializable;
//
///**
// * @ClassName OrderTimeDataDTO
// * @Author hupeng <610796224@qq.com>
// * @Date 2019/11/25
// **/
//@Data
//public class OrderTimeDataDTO implements Serializable {
// private Double todayPrice; //今日成交额
// private Integer todayCount; //今日订单数
// private Double proPrice; //昨日成交额
// private Integer proCount;//昨日订单数
// private Double monthPrice;//本月成交额
// private Integer monthCount;//本月订单数
//}

27
yshop-app/src/main/java/co/yixiang/modules/monitor/config/VisitsInitialization.java
View File

@ -1,27 +0,0 @@
//package co.yixiang.modules.monitor.config;
//
//import co.yixiang.modules.monitor.service.VisitsService;
//import org.springframework.boot.ApplicationArguments;
//import org.springframework.boot.ApplicationRunner;
//import org.springframework.stereotype.Component;
//
///**
// * 初始化站点统计
// * @author Zheng Jie
// */
//@Component
//public class VisitsInitialization implements ApplicationRunner {
//
// private final VisitsService visitsService;
//
// public VisitsInitialization(VisitsService visitsService) {
// this.visitsService = visitsService;
// }
//
// @Override
// public void run(ApplicationArguments args) throws Exception {
// System.out.println("--------------- 初始化站点统计，如果存在今日统计则跳过 ---------------");
// visitsService.save();
// System.out.println("--------------- 初始化站点统计完成 ---------------");
// }
//}

35
yshop-app/src/main/java/co/yixiang/modules/monitor/domain/Visits.java
View File

@ -1,35 +0,0 @@
//package co.yixiang.modules.monitor.domain;
//
//import com.baomidou.mybatisplus.annotation.FieldFill;
//import com.baomidou.mybatisplus.annotation.TableField;
//import com.baomidou.mybatisplus.annotation.TableId;
//import com.baomidou.mybatisplus.annotation.TableName;
//import lombok.Data;
//
//import java.io.Serializable;
//import java.sql.Timestamp;
//
///**
// * pv 与 ip 统计
// *
// * @author Zheng Jie
// * @date 2018-12-13
// */
//@Data
//@TableName( "visits")
//public class Visits implements Serializable {
//
// @TableId
// private Long id;
//
// private String date;
//
// private Long pvCounts;
//
// private Long ipCounts;
//
// @TableField(fill = FieldFill.INSERT)
// private Timestamp createTime;
//
// private String weekDay;
//}

24
yshop-app/src/main/java/co/yixiang/modules/monitor/domain/vo/RedisVo.java
View File

@ -1,24 +0,0 @@
package co.yixiang.modules.monitor.domain.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @author Zheng Jie
* @date 2018-12-10
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class RedisVo implements Serializable {
@NotBlank
private String key;
@NotBlank
private String value;
}

39
yshop-app/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java
View File

@ -1,39 +0,0 @@
///**
// * Copyright (C) 2018-2020
// * All rights reserved, Designed By www.yixiang.co
// * 注意：
// * 本软件为www.yixiang.co开发研制，未经购买不得使用
// * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
// * 一经发现盗用、分享等行为，将追究法律责任，后果自负
// */
//package co.yixiang.modules.monitor.rest;
//
//import co.yixiang.annotation.Limit;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.rest.bind.annotation.GetMapping;
//import org.springframework.rest.bind.annotation.RequestMapping;
//import org.springframework.rest.bind.annotation.RestController;
//
//import java.util.concurrent.atomic.AtomicInteger;
//
///**
// *
// * 接口限流测试类
// */
//@RestController
//@RequestMapping("api")
//@Api(value = "接口限流测试", tags = "接口限流测试", description = "接口限流测试")
//public class LimitController {
// private static final AtomicInteger ATOMIC_INTEGER = new AtomicInteger();
//
// /**
// * 测试限流注解，下面配置说明该接口 60秒内最多只能访问 10次，保存到redis的键名为 limit_test，
// */
// @Limit(key = "test", period = 60, count = 10, name = "testLimit", prefix = "limit")
// @GetMapping("/limit")
// @ApiOperation(value = "测试示例",notes = "测试示例")
// public int testLimit() {
// return ATOMIC_INTEGER.incrementAndGet();
// }
//}

49
yshop-app/src/main/java/co/yixiang/modules/monitor/service/RedisService.java
View File

@ -1,49 +0,0 @@
///**
// * Copyright (C) 2018-2020
// * All rights reserved, Designed By www.yixiang.co
// * 注意：
// * 本软件为www.yixiang.co开发研制，未经购买不得使用
// * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
// * 一经发现盗用、分享等行为，将追究法律责任，后果自负
// */
//package co.yixiang.modules.monitor.service;
//
//import org.springframework.data.domain.Page;
//import org.springframework.data.domain.Pageable;
//
//public interface RedisService {
//
// /**
// * findById
// * @param key
// * @return
// */
// Page findByKey(String key, Pageable pageable);
//
// /**
// * 查询验证码的值
// * @param key
// * @return
// */
// String getCodeVal(String key);
//
// Object getObj(String key);
//
// /**
// * 保存验证码
// * @param key
// * @param val
// */
// void saveCode(String key, Object val,Long time);
//
// /**
// * delete
// * @param key
// */
// void delete(String key);
//
// /**
// * 清空所有缓存
// */
// void flushdb();
//}

43
yshop-app/src/main/java/co/yixiang/modules/monitor/service/VisitsService.java
View File

@ -1,43 +0,0 @@
///**
// * Copyright (C) 2018-2020
// * All rights reserved, Designed By www.yixiang.co
// * 注意：
// * 本软件为www.yixiang.co开发研制，未经购买不得使用
// * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
// * 一经发现盗用、分享等行为，将追究法律责任，后果自负
// */
//package co.yixiang.modules.monitor.service;
//
//import co.yixiang.commonold.service.BaseService;
//import co.yixiang.modules.monitor.domain.Visits;
//import org.springframework.scheduling.annotation.Async;
//
//import javax.servlet.http.HttpServletRequest;
//
//
//public interface VisitsService extends BaseService<Visits> {
//
// /**
// * 提供给定时任务，每天0点执行
// */
// void save();
//
// /**
// * 新增记录
// * @param request
// */
// @Async
// void count(HttpServletRequest request);
//
// /**
// * 获取数据
// * @return
// */
// Object get();
//
// /**
// * getChartData
// * @return
// */
// Object getChartData();
//}

87
yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java
View File

@ -1,87 +0,0 @@
///**
// * Copyright (C) 2018-2020
// * All rights reserved, Designed By www.yixiang.co
// * 注意：
// * 本软件为www.yixiang.co开发研制，未经购买不得使用
// * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
// * 一经发现盗用、分享等行为，将追究法律责任，后果自负
// */
//package co.yixiang.modules.monitor.service.impl;
//
//import co.yixiang.modules.monitor.domain.vo.RedisVo;
//import co.yixiang.modules.monitor.service.RedisService;
//import co.yixiang.utils.PageUtil;
//import lombok.RequiredArgsConstructor;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.beans.factory.annotation.Value;
//import org.springframework.data.domain.Page;
//import org.springframework.data.domain.PageImpl;
//import org.springframework.data.domain.Pageable;
//import org.springframework.data.redis.core.RedisTemplate;
//import org.springframework.stereotype.Service;
//
//import java.util.ArrayList;
//import java.util.List;
//import java.util.concurrent.TimeUnit;
//
//@Service
//@RequiredArgsConstructor(onConstructor = @__(@Autowired))
//public class RedisServiceImpl implements RedisService {
//
// private final RedisTemplate redisTemplate;
//
// @Value("${loginCode.expiration}")
// private Long expiration;
//
// @Override
// public Page<RedisVo> findByKey(String key, Pageable pageable){
// List<RedisVo> redisVos = new ArrayList<>();
// if(!"*".equals(key)){
// key = "*" + key + "*";
// }
// for (Object s : redisTemplate.keys(key)) {
// // 过滤掉权限的缓存
// if (s.toString().indexOf("role::loadPermissionByUser") != -1 || s.toString().indexOf("user::loadUserByUsername") != -1) {
// continue;
// }
// RedisVo redisVo = new RedisVo(s.toString(),redisTemplate.opsForValue().get(s.toString()).toString());
// redisVos.add(redisVo);
// }
// Page<RedisVo> page = new PageImpl<RedisVo>(
// PageUtil.toPage(pageable.getPageNumber(),pageable.getPageSize(),redisVos),
// pageable,
// redisVos.size());
// return page;
// }
//
// @Override
// public void delete(String key) {
// redisTemplate.delete(key);
// }
//
// @Override
// public void flushdb() {
// redisTemplate.getConnectionFactory().getConnection().flushDb();
// }
//
// @Override
// public String getCodeVal(String key) {
// try {
// String value = redisTemplate.opsForValue().get(key).toString();
// return value;
// }catch (Exception e){
// return "";
// }
// }
//
// @Override
// public Object getObj(String key) {
// return redisTemplate.opsForValue().get(key);
// }
//
// @Override
// public void saveCode(String key, Object val,Long time) {
// redisTemplate.opsForValue().set(key,val);
// redisTemplate.expire(key,time, TimeUnit.SECONDS);
// }
//}

97
yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java
View File

@ -1,97 +0,0 @@
//package co.yixiang.modules.monitor.service.impl;
//
//import co.yixiang.commonold.service.impl.BaseServiceImpl;
//import co.yixiang.logging.service.mapper.LogMapper;
//import co.yixiang.modules.monitor.domain.Visits;
//import co.yixiang.modules.monitor.service.VisitsService;
//import co.yixiang.modules.monitor.service.mapper.VisitsMapper;
//import co.yixiang.utils.StringUtils;
//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Service;
//import org.springframework.transaction.annotation.Propagation;
//import org.springframework.transaction.annotation.Transactional;
//
//import javax.servlet.http.HttpServletRequest;
//import java.time.LocalDate;
//import java.util.HashMap;
//import java.util.List;
//import java.util.Map;
//
///**
// * @author hupeng
// * @date 2020-05-20
// */
//@Slf4j
//@Service
//@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
//public class VisitsServiceImpl extends BaseServiceImpl<VisitsMapper, Visits> implements VisitsService {
//
//
// private final LogMapper logMapper;
//
// private final VisitsMapper visitsMapper;
//
// public VisitsServiceImpl(LogMapper logMapper, VisitsMapper visitsMapper) {
// this.logMapper = logMapper;
// this.visitsMapper = visitsMapper;
// }
//
//
// @Override
// public void save() {
// LocalDate localDate = LocalDate.now();
// Visits visits = this.getOne(new QueryWrapper<Visits>().lambda()
// .eq(Visits::getDate,localDate.toString()));
// if(visits == null){
// visits = new Visits();
// visits.setWeekDay(StringUtils.getWeekDay());
// visits.setPvCounts(1L);
// visits.setIpCounts(1L);
// visits.setDate(localDate.toString());
// this.save(visits);
// }
// }
//
// @Override
// public void count(HttpServletRequest request) {
// LocalDate localDate = LocalDate.now();
// Visits visits = this.getOne(new QueryWrapper<Visits>().lambda()
// .eq(Visits::getDate,localDate.toString()));
// visits.setPvCounts(visits.getPvCounts()+1);
// long ipCounts = logMapper.findIp(localDate.toString(), localDate.plusDays(1).toString());
// visits.setIpCounts(ipCounts);
// this.saveOrUpdate(visits);
// }
//
// @Override
// public Object get() {
// Map<String,Object> map = new HashMap<>(4);
// LocalDate localDate = LocalDate.now();
// Visits visits = this.getOne(new QueryWrapper<Visits>().lambda()
// .eq(Visits::getDate,localDate.toString()));
// List<Visits> list = visitsMapper.findAllVisits(localDate.minusDays(6).toString(),localDate.plusDays(1).toString());
//
// long recentVisits = 0, recentIp = 0;
// for (Visits data : list) {
// recentVisits += data.getPvCounts();
// recentIp += data.getIpCounts();
// }
// map.put("newVisits",visits.getPvCounts());
// map.put("newIp",visits.getIpCounts());
// map.put("recentVisits",recentVisits);
// map.put("recentIp",recentIp);
// return map;
// }
//
// @Override
// public Object getChartData() {
// Map<String,Object> map = new HashMap<>(3);
// LocalDate localDate = LocalDate.now();
//// List<Visits> list = visitsRepository.findAllVisits(localDate.minusDays(6).toString(),localDate.plusDays(1).toString());
//// map.put("weekDays",list.stream().map(Visits::getWeekDay).collect(Collectors.toList()));
//// map.put("visitsData",list.stream().map(Visits::getPvCounts).collect(Collectors.toList()));
//// map.put("ipData",list.stream().map(Visits::getIpCounts).collect(Collectors.toList()));
// return map;
// }
//}

17
yshop-app/src/main/java/co/yixiang/modules/monitor/service/mapper/VisitsMapper.java
View File

@ -1,17 +0,0 @@
//package co.yixiang.modules.monitor.service.mapper;
//
//import co.yixiang.commonold.mapper.CoreMapper;
//import co.yixiang.modules.monitor.domain.Visits;
//import org.apache.ibatis.annotations.Mapper;
//import org.apache.ibatis.annotations.Param;
//import org.apache.ibatis.annotations.Select;
//import org.springframework.stereotype.Repository;
//
//import java.util.List;
//
//@Repository
//@Mapper
//public interface VisitsMapper extends CoreMapper<Visits> {
// @Select("select * FROM visits where create_time between #{time1} and #{time2}")
// List<Visits> findAllVisits(@Param("time1") String time1, @Param("time2")String time2);
//}

25
yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderCountDTO.java
View File

@ -1,25 +0,0 @@
//package co.yixiang.modules.order.rest.dto;
//
//import lombok.Data;
//
//import java.io.Serializable;
//
///**
// * @ClassName OrderCountDTO
// * @Author hupeng <610796224@qq.com>
// * @Date 2019/10/30
// **/
//@Data
//public class OrderCountDTO implements Serializable {
// //订单支付没有退款 数量
// private Integer orderCount;
// //订单支付没有退款 支付总金额
// private Double sumPrice;
// //订单待支付 数量
// private Integer unpaidCount;
// private Integer unshippedCount; //订单待发货 数量
// private Integer receivedCount; //订单待收货 数量
// private Integer evaluatedCount; //订单待评价 数量
// private Integer completeCount; //订单已完成 数量
// private Integer refundCount; //订单退款
//}

4
yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderExtendDTO.java → yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderExtendDto.java
View File

@ -9,7 +9,7 @@ import java.io.Serializable;
import java.util.Map;
/**
* @ClassName OrderExtendDTO
* @ClassName OrderExtendDto
* @Author hupeng <610796224@qq.com>
* @Date 2019/10/28
**/
@ -17,7 +17,7 @@ import java.util.Map;
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class OrderExtendDTO implements Serializable {
public class OrderExtendDto implements Serializable {
private String key;
private String orderId;
private Map<String,String> jsConfig;

4
yshop-app/src/main/java/co/yixiang/modules/order/dto/PayDTO.java → yshop-app/src/main/java/co/yixiang/modules/order/dto/PayDto.java
View File

@ -5,12 +5,12 @@ import lombok.Data;
import java.io.Serializable;
/**
* @ClassName PayDTO
* @ClassName PayDto
* @Author hupeng <610796224@qq.com>
* @Date 2019/11/7
**/
@Data
public class PayDTO implements Serializable {
public class PayDto implements Serializable {
private String from;
private String paytype;
private String uni;

11
yshop-app/src/main/java/co/yixiang/modules/order/dto/WxPayResultDTO.java
View File

@ -1,11 +0,0 @@
package co.yixiang.modules.order.dto;
import java.io.Serializable;
/**
* @ClassName WxPayResultDTO
* @Author hupeng <610796224@qq.com>
* @Date 2019/11/6
**/
public class WxPayResultDTO implements Serializable {
}

2
yshop-app/src/main/java/co/yixiang/modules/order/param/PayParam.java
View File

@ -6,7 +6,7 @@ import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @ClassName PayDTO
* @ClassName PayDto
* @Author hupeng <610796224@qq.com>
* @Date 2019/11/7
**/

6
yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
View File

@ -19,7 +19,7 @@ import co.yixiang.common.interceptor.AuthCheck;
import co.yixiang.enums.OrderInfoEnum;
import co.yixiang.enums.OrderLogEnum;
import co.yixiang.modules.order.domain.YxStoreOrder;
import co.yixiang.modules.order.dto.OrderExtendDTO;
import co.yixiang.modules.order.dto.OrderExtendDto;
import co.yixiang.modules.order.param.*;
import co.yixiang.modules.order.service.YxStoreOrderService;
import co.yixiang.modules.order.vo.ComputeVo;
@ -137,7 +137,7 @@ public class StoreOrderController {
String orderId = order.getOrderId();
OrderExtendDTO orderDTO = new OrderExtendDTO();
OrderExtendDto orderDTO = new OrderExtendDto();
orderDTO.setKey(key);
orderDTO.setOrderId(orderId);
map.put("status",OrderLogEnum.CREATE_ORDER_SUCCESS.getValue());
@ -176,7 +176,7 @@ public class StoreOrderController {
String orderId = storeOrder.getOrderId();
OrderExtendDTO orderDTO = new OrderExtendDTO();
OrderExtendDto orderDTO = new OrderExtendDto();
orderDTO.setOrderId(orderId);
map.put("status","SUCCESS");
map.put("result",orderDTO);

13
yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java
View File

@ -11,7 +11,6 @@ package co.yixiang.modules.services;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.api.ApiResult;
import co.yixiang.api.YshopException;
import co.yixiang.enums.*;
import co.yixiang.modules.activity.domain.YxStoreBargainUser;
@ -20,9 +19,9 @@ import co.yixiang.modules.activity.service.YxStorePinkService;
import co.yixiang.modules.cart.vo.YxStoreCartQueryVo;
import co.yixiang.modules.order.domain.YxStoreOrder;
import co.yixiang.modules.order.domain.YxStoreOrderCartInfo;
import co.yixiang.modules.order.dto.OrderExtendDto;
import co.yixiang.modules.order.service.dto.ProductAttrDto;
import co.yixiang.modules.order.vo.OrderCartInfoVo;
import co.yixiang.modules.order.dto.OrderExtendDTO;
import co.yixiang.modules.order.service.dto.ProductDto;
import co.yixiang.modules.order.param.ComputeOrderParam;
import co.yixiang.modules.order.service.YxStoreOrderCartInfoService;
@ -106,7 +105,7 @@ public class OrderSupplyService {
YxStoreOrderQueryVo storeOrder = storeOrderService.getOrderInfo(key,uid);
if(ObjectUtil.isNotNull(storeOrder)){
OrderExtendDTO orderExtendDTO = OrderExtendDTO.builder()
OrderExtendDto orderExtendDTO = OrderExtendDto.builder()
.key(key)
.orderId(storeOrder.getOrderId())
.build();
@ -135,14 +134,14 @@ public class OrderSupplyService {
YxStoreOrder yxStoreOrder = storeOrderService.getOrderPink(pinkId,uid);
if(yxStoreOrder != null){
map.put("status",OrderLogEnum.PINK_ORDER_FAIL_1.getValue());
OrderExtendDTO orderExtendDTO = new OrderExtendDTO();
OrderExtendDto orderExtendDTO = new OrderExtendDto();
orderExtendDTO.setOrderId(yxStoreOrder.getOrderId());
map.put("result",orderExtendDTO);
map.put("msg",OrderLogEnum.PINK_ORDER_FAIL_1.getDesc());
}
if(yxStoreOrder != null && storePinkService.getIsPinkUid(pinkId,uid)){
map.put("status",OrderLogEnum.PINK_ORDER_FAIL_2.getValue());
OrderExtendDTO orderExtendDTO = new OrderExtendDTO();
OrderExtendDto orderExtendDTO = new OrderExtendDto();
orderExtendDTO.setOrderId(yxStoreOrder.getOrderId());
map.put("result",orderExtendDTO);
map.put("msg",OrderLogEnum.PINK_ORDER_FAIL_2.getDesc());
@ -165,8 +164,8 @@ public class OrderSupplyService {
* @param orderDTO orderDTO
* @return map
*/
public Map<String, Object> goPay(Map<String, Object> map,String orderId, Long uid,String payType,
String from,OrderExtendDTO orderDTO){
public Map<String, Object> goPay(Map<String, Object> map, String orderId, Long uid, String payType,
String from, OrderExtendDto orderDTO){
switch (PayTypeEnum.toType(payType)){
case WEIXIN:
Map<String,String> jsConfig = new HashMap<>();