From 0b868c2f284c357bd197f5e433715281a26011df Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 28 Jun 2020 14:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8VO=E5=8F=8A?= =?UTF-8?q?=E5=85=B6=E5=85=B6=E4=BB=96,=E8=A7=84=E8=8C=83=E4=B8=8B?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ChartDataDTO.java => ChartDataDto.java} | 4 +- .../modules/manage/dto/OrderTimeDataDTO.java | 20 ---- .../monitor/config/VisitsInitialization.java | 27 ------ .../modules/monitor/domain/Visits.java | 35 ------- .../modules/monitor/domain/vo/RedisVo.java | 24 ----- .../modules/monitor/rest/LimitController.java | 39 -------- .../modules/monitor/service/RedisService.java | 49 ---------- .../monitor/service/VisitsService.java | 43 -------- .../service/impl/RedisServiceImpl.java | 87 ----------------- .../service/impl/VisitsServiceImpl.java | 97 ------------------- .../monitor/service/mapper/VisitsMapper.java | 17 ---- .../modules/order/dto/OrderCountDTO.java | 25 ----- ...rderExtendDTO.java => OrderExtendDto.java} | 4 +- .../order/dto/{PayDTO.java => PayDto.java} | 4 +- .../modules/order/dto/WxPayResultDTO.java | 11 --- .../yixiang/modules/order/param/PayParam.java | 2 +- .../order/rest/StoreOrderController.java | 6 +- .../modules/services/OrderSupplyService.java | 13 ++- 18 files changed, 16 insertions(+), 491 deletions(-) rename yshop-app/src/main/java/co/yixiang/modules/manage/dto/{ChartDataDTO.java => ChartDataDto.java} (69%) delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/manage/dto/OrderTimeDataDTO.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/monitor/config/VisitsInitialization.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/monitor/domain/Visits.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/monitor/domain/vo/RedisVo.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/monitor/service/RedisService.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/monitor/service/VisitsService.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/monitor/service/mapper/VisitsMapper.java delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderCountDTO.java rename yshop-app/src/main/java/co/yixiang/modules/order/dto/{OrderExtendDTO.java => OrderExtendDto.java} (79%) rename yshop-app/src/main/java/co/yixiang/modules/order/dto/{PayDTO.java => PayDto.java} (74%) delete mode 100644 yshop-app/src/main/java/co/yixiang/modules/order/dto/WxPayResultDTO.java diff --git a/yshop-app/src/main/java/co/yixiang/modules/manage/dto/ChartDataDTO.java b/yshop-app/src/main/java/co/yixiang/modules/manage/dto/ChartDataDto.java similarity index 69% rename from yshop-app/src/main/java/co/yixiang/modules/manage/dto/ChartDataDTO.java rename to yshop-app/src/main/java/co/yixiang/modules/manage/dto/ChartDataDto.java index 3d03e6d8..9f3f3de7 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/manage/dto/ChartDataDTO.java +++ b/yshop-app/src/main/java/co/yixiang/modules/manage/dto/ChartDataDto.java @@ -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; } diff --git a/yshop-app/src/main/java/co/yixiang/modules/manage/dto/OrderTimeDataDTO.java b/yshop-app/src/main/java/co/yixiang/modules/manage/dto/OrderTimeDataDTO.java deleted file mode 100644 index 74f06d98..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/manage/dto/OrderTimeDataDTO.java +++ /dev/null @@ -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;//本月订单数 -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/monitor/config/VisitsInitialization.java b/yshop-app/src/main/java/co/yixiang/modules/monitor/config/VisitsInitialization.java deleted file mode 100644 index f84631b2..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/monitor/config/VisitsInitialization.java +++ /dev/null @@ -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("--------------- 初始化站点统计完成 ---------------"); -// } -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/monitor/domain/Visits.java b/yshop-app/src/main/java/co/yixiang/modules/monitor/domain/Visits.java deleted file mode 100644 index c429ecc3..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/monitor/domain/Visits.java +++ /dev/null @@ -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; -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/monitor/domain/vo/RedisVo.java b/yshop-app/src/main/java/co/yixiang/modules/monitor/domain/vo/RedisVo.java deleted file mode 100644 index 02cd0caf..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/monitor/domain/vo/RedisVo.java +++ /dev/null @@ -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; -} diff --git a/yshop-app/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java b/yshop-app/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java deleted file mode 100644 index d4b5510f..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/monitor/rest/LimitController.java +++ /dev/null @@ -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(); -// } -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/RedisService.java b/yshop-app/src/main/java/co/yixiang/modules/monitor/service/RedisService.java deleted file mode 100644 index 11191950..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/RedisService.java +++ /dev/null @@ -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(); -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/VisitsService.java b/yshop-app/src/main/java/co/yixiang/modules/monitor/service/VisitsService.java deleted file mode 100644 index 09b19448..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/VisitsService.java +++ /dev/null @@ -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 { -// -// /** -// * 提供给定时任务，每天0点执行 -// */ -// void save(); -// -// /** -// * 新增记录 -// * @param request -// */ -// @Async -// void count(HttpServletRequest request); -// -// /** -// * 获取数据 -// * @return -// */ -// Object get(); -// -// /** -// * getChartData -// * @return -// */ -// Object getChartData(); -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java b/yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java deleted file mode 100644 index b7df4d29..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/RedisServiceImpl.java +++ /dev/null @@ -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 findByKey(String key, Pageable pageable){ -// List 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 page = new PageImpl( -// 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); -// } -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java b/yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java deleted file mode 100644 index 843e8cbe..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java +++ /dev/null @@ -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 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().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().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 map = new HashMap<>(4); -// LocalDate localDate = LocalDate.now(); -// Visits visits = this.getOne(new QueryWrapper().lambda() -// .eq(Visits::getDate,localDate.toString())); -// List 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 map = new HashMap<>(3); -// LocalDate localDate = LocalDate.now(); -//// List 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; -// } -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/mapper/VisitsMapper.java b/yshop-app/src/main/java/co/yixiang/modules/monitor/service/mapper/VisitsMapper.java deleted file mode 100644 index 16aa0004..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/monitor/service/mapper/VisitsMapper.java +++ /dev/null @@ -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 { -// @Select("select * FROM visits where create_time between #{time1} and #{time2}") -// List findAllVisits(@Param("time1") String time1, @Param("time2")String time2); -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderCountDTO.java b/yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderCountDTO.java deleted file mode 100644 index 194cf49b..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderCountDTO.java +++ /dev/null @@ -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; //订单退款 -//} diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderExtendDTO.java b/yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderExtendDto.java similarity index 79% rename from yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderExtendDTO.java rename to yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderExtendDto.java index c924a215..631614a5 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderExtendDTO.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/dto/OrderExtendDto.java @@ -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 jsConfig; diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/dto/PayDTO.java b/yshop-app/src/main/java/co/yixiang/modules/order/dto/PayDto.java similarity index 74% rename from yshop-app/src/main/java/co/yixiang/modules/order/dto/PayDTO.java rename to yshop-app/src/main/java/co/yixiang/modules/order/dto/PayDto.java index 4803daf3..edc5b296 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/dto/PayDTO.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/dto/PayDto.java @@ -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; diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/dto/WxPayResultDTO.java b/yshop-app/src/main/java/co/yixiang/modules/order/dto/WxPayResultDTO.java deleted file mode 100644 index fa1e94d7..00000000 --- a/yshop-app/src/main/java/co/yixiang/modules/order/dto/WxPayResultDTO.java +++ /dev/null @@ -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 { -} diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/param/PayParam.java b/yshop-app/src/main/java/co/yixiang/modules/order/param/PayParam.java index 76d36658..e3796081 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/param/PayParam.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/param/PayParam.java @@ -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 **/ diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index 37acf87d..95f8d47f 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -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); diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java index 76087142..ad65c5a7 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/OrderSupplyService.java @@ -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 goPay(Map map,String orderId, Long uid,String payType, - String from,OrderExtendDTO orderDTO){ + public Map goPay(Map map, String orderId, Long uid, String payType, + String from, OrderExtendDto orderDTO){ switch (PayTypeEnum.toType(payType)){ case WEIXIN: Map jsConfig = new HashMap<>();