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:00:18 +08:00
parent f29b38947b
commit f7a79714d5
27 changed files with 93 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
sql/yxshop3.0.sql
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
//package co.yixiang.modules.manage.web.dto;
//package co.yixiang.modules.manage.rest.dto;
//
//import lombok.Data;
//

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

@ -11,9 +11,9 @@
//import co.yixiang.annotation.Limit;
//import io.swagger.annotations.Api;
//import io.swagger.annotations.ApiOperation;
//import org.springframework.web.bind.annotation.GetMapping;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RestController;
//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;
//

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

@ -1,4 +1,4 @@
//package co.yixiang.modules.order.web.dto;
//package co.yixiang.modules.order.rest.dto;
//
//import lombok.Data;
//

2
yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java
View File

@ -80,6 +80,7 @@ public class AuthService {
WxMaUserInfo wxMpUser = wxMaService.getUserService()
.getUserInfo(session.getSessionKey(), encryptedData, iv);
String openid = wxMpUser.getOpenId();
long uid = 0;
//如果开启了UnionId
if (StrUtil.isNotBlank(wxMpUser.getUnionId())) {
openid = wxMpUser.getUnionId();
@ -88,7 +89,6 @@ public class AuthService {
YxUser yxUser = userService.getOne(Wrappers.<YxUser>lambdaQuery()
.eq(YxUser::getUsername, openid),false);
long uid = 0;
if (ObjectUtil.isNull(yxUser)) {

51
yshop-app/src/main/java/co/yixiang/modules/user/vo/YxSystemAttachmentQueryVo.java
View File

@ -1,51 +0,0 @@
package co.yixiang.modules.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* <p>
* 附件管理表 查询结果对象
* </p>
*
* @author hupeng
* @date 2019-11-11
*/
@Data
@ApiModel(value="YxSystemAttachmentQueryVo对象", description="附件管理表查询参数")
public class YxSystemAttachmentQueryVo implements Serializable{
private static final long serialVersionUID = 1L;
private Integer attId;
@ApiModelProperty(value = "附件名称")
private String name;
@ApiModelProperty(value = "附件路径")
private String attDir;
@ApiModelProperty(value = "压缩图片路径")
private String sattDir;
@ApiModelProperty(value = "附件大小")
private String attSize;
@ApiModelProperty(value = "附件类型")
private String attType;
@ApiModelProperty(value = "分类ID0编辑器,1产品图片,2拼团图片,3砍价图片,4秒杀图片,5文章图片,6组合数据图")
private Integer pid;
@ApiModelProperty(value = "上传时间")
private Integer time;
@ApiModelProperty(value = "图片上传类型 1本地 2七牛云 3OSS 4COS ")
private Boolean imageType;
@ApiModelProperty(value = "图片上传模块类型 1 后台上传 2 用户生成")
private Boolean moduleType;
}

63
yshop-app/src/main/java/co/yixiang/modules/user/vo/YxUserExtractQueryVo.java
View File

@ -1,63 +0,0 @@
package co.yixiang.modules.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
* 用户提现表 查询结果对象
* </p>
*
* @author hupeng
* @date 2019-11-11
*/
@Data
@ApiModel(value = "YxUserExtractQueryVo对象", description = "用户提现表查询参数")
public class YxUserExtractQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
private Integer uid;
@ApiModelProperty(value = "名称")
private String realName;
@ApiModelProperty(value = "bank = 银行卡 alipay = 支付宝wx=微信")
private String extractType;
@ApiModelProperty(value = "银行卡")
private String bankCode;
@ApiModelProperty(value = "开户地址")
private String bankAddress;
@ApiModelProperty(value = "支付宝账号")
private String alipayCode;
@ApiModelProperty(value = "提现金额")
private BigDecimal extractPrice;
private String mark;
private BigDecimal balance;
@ApiModelProperty(value = "无效原因")
private String failMsg;
private Integer failTime;
@ApiModelProperty(value = "添加时间")
private Integer addTime;
@ApiModelProperty(value = "-1 未通过 0 审核中 1 已提现")
private Integer status;
@ApiModelProperty(value = "微信号")
private String wechat;
}

60
yshop-app/src/main/java/co/yixiang/modules/user/vo/YxUserLevelQueryVo.java
View File

@ -1,60 +0,0 @@
package co.yixiang.modules.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* <p>
* 用户等级记录表 查询结果对象
* </p>
*
* @author hupeng
* @date 2019-12-06
*/
@Data
@ApiModel(value="YxUserLevelQueryVo对象", description="用户等级记录表查询参数")
public class YxUserLevelQueryVo implements Serializable{
private static final long serialVersionUID = 1L;
private Integer id;
@ApiModelProperty(value = "用户uid")
private Integer uid;
@ApiModelProperty(value = "等级vip")
private Integer levelId;
@ApiModelProperty(value = "会员等级")
private Integer grade;
@ApiModelProperty(value = "过期时间")
private Integer validTime;
@ApiModelProperty(value = "是否永久")
private Boolean isForever;
@ApiModelProperty(value = "商户id")
private Integer merId;
@ApiModelProperty(value = "0:禁止,1:正常")
private Boolean status;
@ApiModelProperty(value = "备注")
private String mark;
@ApiModelProperty(value = "是否已通知")
private Boolean remind;
@ApiModelProperty(value = "是否删除,0=未删除,1=删除")
private Boolean isDel;
@ApiModelProperty(value = "添加时间")
private Integer addTime;
@ApiModelProperty(value = "享受折扣")
private Integer discount;
}

49
yshop-app/src/main/java/co/yixiang/modules/user/vo/YxUserRechargeQueryVo.java
View File

@ -1,49 +0,0 @@
package co.yixiang.modules.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
* 用户充值表 查询结果对象
* </p>
*
* @author hupeng
* @date 2019-12-08
*/
@Data
@ApiModel(value = "YxUserRechargeQueryVo对象", description = "用户充值表查询参数")
public class YxUserRechargeQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
@ApiModelProperty(value = "充值用户UID")
private Integer uid;
@ApiModelProperty(value = "订单号")
private String orderId;
@ApiModelProperty(value = "充值金额")
private BigDecimal price;
@ApiModelProperty(value = "充值类型")
private String rechargeType;
@ApiModelProperty(value = "是否充值")
private Integer paid;
@ApiModelProperty(value = "充值支付时间")
private Integer payTime;
@ApiModelProperty(value = "充值时间")
private Integer addTime;
@ApiModelProperty(value = "退款金额")
private BigDecimal refundPrice;
}

95
yshop-app/src/main/java/co/yixiang/modules/user/vo/YxWechatUserQueryVo.java
View File

@ -1,95 +0,0 @@
package co.yixiang.modules.user.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
* 微信用户表 查询结果对象
* </p>
*
* @author hupeng
* @date 2019-10-27
*/
@Data
@ApiModel(value = "YxWechatUserQueryVo对象", description = "微信用户表查询参数")
public class YxWechatUserQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "微信用户id")
private Integer uid;
@ApiModelProperty(value = "只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段")
private String unionid;
@ApiModelProperty(value = "用户的标识，对当前公众号唯一")
private String openid;
@ApiModelProperty(value = "小程序唯一身份ID")
private String routineOpenid;
@ApiModelProperty(value = "用户的昵称")
private String nickname;
@ApiModelProperty(value = "用户头像")
private String headimgurl;
@ApiModelProperty(value = "用户的性别，值为1时是男性，值为2时是女性，值为0时是未知")
private Integer sex;
@ApiModelProperty(value = "用户所在城市")
private String city;
@ApiModelProperty(value = "用户的语言，简体中文为zh_CN")
private String language;
@ApiModelProperty(value = "用户所在省份")
private String province;
@ApiModelProperty(value = "用户所在国家")
private String country;
@ApiModelProperty(value = "公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注")
private String remark;
@ApiModelProperty(value = "用户所在的分组ID（兼容旧的用户分组接口）")
private Integer groupid;
@ApiModelProperty(value = "用户被打上的标签ID列表")
private String tagidList;
@ApiModelProperty(value = "用户是否订阅该公众号标识")
private Integer subscribe;
@ApiModelProperty(value = "关注公众号时间")
private Integer subscribeTime;
@ApiModelProperty(value = "添加时间")
private Integer addTime;
@ApiModelProperty(value = "一级推荐人")
private Integer stair;
@ApiModelProperty(value = "二级推荐人")
private Integer second;
@ApiModelProperty(value = "一级推荐人订单")
private Integer orderStair;
@ApiModelProperty(value = "二级推荐人订单")
private Integer orderSecond;
@ApiModelProperty(value = "佣金")
private BigDecimal nowMoney;
@ApiModelProperty(value = "小程序用户会话密匙")
private String sessionKey;
@ApiModelProperty(value = "用户类型")
private String userType;
}

48
yshop-app/src/main/java/co/yixiang/modules/wechat/entity/YxWechatTemplate.java
View File

@ -1,48 +0,0 @@
package co.yixiang.modules.wechat.entity;
import co.yixiang.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 微信模板
* </p>
*
* @author hupeng
* @since 2019-12-10
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "YxWechatTemplate对象", description = "微信模板")
public class YxWechatTemplate extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "模板id")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty(value = "模板编号")
private String tempkey;
@ApiModelProperty(value = "模板名")
private String name;
@ApiModelProperty(value = "回复内容")
private String content;
@ApiModelProperty(value = "模板ID")
private String tempid;
@ApiModelProperty(value = "添加时间")
private String addTime;
@ApiModelProperty(value = "状态")
private Integer status;
}

40
yshop-app/src/main/java/co/yixiang/modules/wechat/mapper/YxWechatTemplateMapper.java
View File

@ -1,40 +0,0 @@
package co.yixiang.modules.wechat.mapper;
import co.yixiang.modules.wechat.entity.YxWechatTemplate;
import co.yixiang.modules.wechat.web.param.YxWechatTemplateQueryParam;
import co.yixiang.modules.wechat.web.vo.YxWechatTemplateQueryVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
/**
* <p>
* 微信模板 Mapper 接口
* </p>
*
* @author hupeng
* @since 2019-12-10
*/
@Repository
public interface YxWechatTemplateMapper extends BaseMapper<YxWechatTemplate> {
/**
* 根据ID获取查询对象
* @param id
* @return
*/
YxWechatTemplateQueryVo getYxWechatTemplateById(Serializable id);
/**
* 获取分页对象
* @param page
* @param yxWechatTemplateQueryParam
* @return
*/
IPage<YxWechatTemplateQueryVo> getYxWechatTemplatePageList(@Param("page") Page page, @Param("param") YxWechatTemplateQueryParam yxWechatTemplateQueryParam);
}

2
yshop-app/src/main/java/co/yixiang/modules/wechat/web/controller/WechatController.java → yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatController.java
View File

@ -6,7 +6,7 @@
* 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
* 一经发现盗用、分享等行为，将追究法律责任，后果自负
*/
package co.yixiang.modules.wechat.web.rest;
package co.yixiang.modules.wechat.rest.rest;
import co.yixiang.annotation.AnonymousAccess;

14
yshop-app/src/main/java/co/yixiang/modules/wechat/web/controller/WxMaUserController.java → yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java
View File

@ -6,7 +6,7 @@
// * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
// * 一经发现盗用、分享等行为，将追究法律责任，后果自负
// */
//package co.yixiang.modules.wechat.web.rest;
//package co.yixiang.modules.wechat.rest.rest;
//
//import cn.binarywang.wx.miniapp.api.WxMaService;
//import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
@ -18,9 +18,9 @@
//import co.yixiang.modules.user.entity.YxUser;
//import co.yixiang.modules.user.service.YxUserService;
//import co.yixiang.modules.user.service.YxWechatUserService;
//import co.yixiang.modules.user.web.vo.YxUserQueryVo;
//import co.yixiang.modules.wechat.web.param.BindPhoneParam;
//import co.yixiang.modules.wechat.web.param.WxPhoneParam;
//import co.yixiang.modules.user.rest.vo.YxUserQueryVo;
//import co.yixiang.modules.wechat.rest.param.BindPhoneParam;
//import co.yixiang.modules.wechat.rest.param.WxPhoneParam;
//import co.yixiang.mp.config.ShopKeyUtils;
//import co.yixiang.utils.RedisUtil;
//import co.yixiang.utils.RedisUtils;
@ -31,9 +31,9 @@
//import me.chanjar.weixin.commonold.error.WxErrorException;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.validation.annotation.Validated;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestBody;
//import org.springframework.web.bind.annotation.RestController;
//import org.springframework.rest.bind.annotation.PostMapping;
//import org.springframework.rest.bind.annotation.RequestBody;
//import org.springframework.rest.bind.annotation.RestController;
//
//import java.util.LinkedHashMap;
//import java.util.Map;

2
yshop-app/src/main/java/co/yixiang/modules/wechat/web/param/BindPhoneParam.java → yshop-app/src/main/java/co/yixiang/modules/wechat/rest/param/BindPhoneParam.java
View File

@ -1,4 +1,4 @@
package co.yixiang.modules.wechat.web.param;
package co.yixiang.modules.wechat.rest.param;
import lombok.Getter;
import lombok.Setter;

2
yshop-app/src/main/java/co/yixiang/modules/wechat/web/param/WxPhoneParam.java → yshop-app/src/main/java/co/yixiang/modules/wechat/rest/param/WxPhoneParam.java
View File

@ -1,4 +1,4 @@
package co.yixiang.modules.wechat.web.param;
package co.yixiang.modules.wechat.rest.param;
import lombok.Getter;
import lombok.Setter;

2
yshop-app/src/main/java/co/yixiang/modules/wechat/web/param/YxWechatTemplateQueryParam.java → yshop-app/src/main/java/co/yixiang/modules/wechat/rest/param/YxWechatTemplateQueryParam.java
View File

@ -1,4 +1,4 @@
package co.yixiang.modules.wechat.web.param;
package co.yixiang.modules.wechat.rest.param;
import co.yixiang.common.web.param.QueryParam;
import io.swagger.annotations.ApiModel;

2
yshop-app/src/main/java/co/yixiang/modules/wechat/web/vo/YxWechatTemplateQueryVo.java → yshop-app/src/main/java/co/yixiang/modules/wechat/rest/vo/YxWechatTemplateQueryVo.java
View File

@ -1,4 +1,4 @@
package co.yixiang.modules.wechat.web.vo;
package co.yixiang.modules.wechat.rest.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;

43
yshop-app/src/main/java/co/yixiang/modules/wechat/service/YxWechatTemplateService.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.wechat.service;
//
//import co.yixiang.commonold.service.BaseService;
//import co.yixiang.commonold.web.vo.Paging;
//import co.yixiang.modules.wechat.entity.YxWechatTemplate;
//import co.yixiang.modules.wechat.web.param.YxWechatTemplateQueryParam;
//import co.yixiang.modules.wechat.web.vo.YxWechatTemplateQueryVo;
//
//import java.io.Serializable;
//
///**
// * <p>
// * 微信模板 服务类
// * </p>
// *
// * @author hupeng
// * @since 2019-12-10
// */
//public interface YxWechatTemplateService extends BaseService<YxWechatTemplate> {
//
// /**
// * 根据ID获取查询对象
// * @param id
// * @return
// */
// YxWechatTemplateQueryVo getYxWechatTemplateById(Serializable id) throws Exception;
//
// /**
// * 获取分页对象
// * @param yxWechatTemplateQueryParam
// * @return
// */
// Paging<YxWechatTemplateQueryVo> getYxWechatTemplatePageList(YxWechatTemplateQueryParam yxWechatTemplateQueryParam) throws Exception;
//
//}

57
yshop-app/src/main/java/co/yixiang/modules/wechat/service/impl/WechatTemplateServiceImpl.java
View File

@ -1,57 +0,0 @@
///**
// * Copyright (C) 2018-2020
// * All rights reserved, Designed By www.yixiang.co
// * 注意：
// * 本软件为www.yixiang.co开发研制，未经购买不得使用
// * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
// * 一经发现盗用、分享等行为，将追究法律责任，后果自负
// */
//package co.yixiang.modules.wechat.service.impl;
//
//import co.yixiang.commonold.service.impl.BaseServiceImpl;
//import co.yixiang.commonold.web.vo.Paging;
//import co.yixiang.modules.wechat.entity.YxWechatTemplate;
//import co.yixiang.modules.wechat.mapper.YxWechatTemplateMapper;
//import co.yixiang.modules.wechat.service.YxWechatTemplateService;
//import co.yixiang.modules.wechat.web.param.YxWechatTemplateQueryParam;
//import co.yixiang.modules.wechat.web.vo.YxWechatTemplateQueryVo;
//import com.baomidou.mybatisplus.core.metadata.IPage;
//import com.baomidou.mybatisplus.core.metadata.OrderItem;
//import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
//import lombok.AllArgsConstructor;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.stereotype.Service;
//import org.springframework.transaction.annotation.Transactional;
//
//import java.io.Serializable;
//
//
///**
// * <p>
// * 微信模板 服务实现类
// * </p>
// *
// * @author hupeng
// * @since 2019-12-10
// */
//@Slf4j
//@Service
//@AllArgsConstructor
//@Transactional(rollbackFor = Exception.class)
//public class WechatTemplateServiceImpl extends BaseServiceImpl<YxWechatTemplateMapper, YxWechatTemplate> implements YxWechatTemplateService {
//
// private final YxWechatTemplateMapper yxWechatTemplateMapper;
//
// @Override
// public YxWechatTemplateQueryVo getYxWechatTemplateById(Serializable id) throws Exception{
// return yxWechatTemplateMapper.getYxWechatTemplateById(id);
// }
//
// @Override
// public Paging<YxWechatTemplateQueryVo> getYxWechatTemplatePageList(YxWechatTemplateQueryParam yxWechatTemplateQueryParam) throws Exception{
// Page page = setPageParam(yxWechatTemplateQueryParam,OrderItem.desc("create_time"));
// IPage<YxWechatTemplateQueryVo> iPage = yxWechatTemplateMapper.getYxWechatTemplatePageList(page,yxWechatTemplateQueryParam);
// return new Paging(iPage);
// }
//
//}

36
yshop-common/src/main/java/co/yixiang/exception/handler/ApiErr.java
View File

@ -1,36 +0,0 @@
///**
// * Copyright (C) 2018-2020
// * All rights reserved, Designed By www.yixiang.co
//
// */
//package co.yixiang.exception.handler;
//
//import com.fasterxml.jackson.annotation.JsonFormat;
//import lombok.Data;
//
//import java.time.LocalDateTime;
//
///**
// * @author hupeng
// * @since 2019-10-02
// */
//@Data
//class ApiErr {
//
// private Integer status;
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// private LocalDateTime timestamp;
// private String msg;
//
// private ApiErr() {
// timestamp = LocalDateTime.now();
// }
//
// public ApiErr(Integer status, String message) {
// this();
// this.status = status;
// this.msg = message;
// }
//}
//
//

43
yshop-common/src/main/java/co/yixiang/exception/handler/ApiError.java
View File

@ -1,43 +0,0 @@
///**
// * Copyright (C) 2018-2020
// * All rights reserved, Designed By www.yixiang.co
//
// */
//package co.yixiang.exception.handler;
//
//import com.fasterxml.jackson.annotation.JsonFormat;
//import lombok.Data;
//
//import java.time.LocalDateTime;
//
///**
// * @author Zheng Jie
// * @date 2018-11-23
// */
//@Data
//class ApiError {
//
// private Integer status = 400;
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
// private LocalDateTime timestamp;
// private String message;
//
// private ApiError() {
// timestamp = LocalDateTime.now();
// }
//
// public static ApiError error(String message){
// ApiError apiError = new ApiError();
// apiError.setMessage(message);
// return apiError;
// }
//
// public static ApiError error(Integer status, String message){
// ApiError apiError = new ApiError();
// apiError.setStatus(status);
// apiError.setMessage(message);
// return apiError;
// }
//}
//
//

130
yshop-common/src/main/java/co/yixiang/exception/handler/GlobalExceptionHandler.java
View File

@ -1,130 +0,0 @@
///**
// * Copyright (C) 2018-2020
// * All rights reserved, Designed By www.yixiang.co
//
// */
//package co.yixiang.exception.handler;
//
//import co.yixiang.exception.BadRequestException;
//import co.yixiang.exception.EntityExistException;
//import co.yixiang.exception.EntityNotFoundException;
//import co.yixiang.exception.ErrorRequestException;
//import co.yixiang.utils.ThrowableUtil;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.http.HttpStatus;
//import org.springframework.http.ResponseEntity;
//import org.springframework.security.authentication.BadCredentialsException;
//import org.springframework.web.bind.MethodArgumentNotValidException;
//import org.springframework.web.bind.annotation.ExceptionHandler;
//import org.springframework.web.bind.annotation.RestControllerAdvice;
//
//import java.util.Objects;
//
//import static org.springframework.http.HttpStatus.NOT_FOUND;
//import static org.springframework.http.HttpStatus.valueOf;
//
///**
// * @author Zheng Jie
// * @date 2018-11-23
// */
//@Slf4j
//@RestControllerAdvice
//@SuppressWarnings("unchecked")
//public class GlobalExceptionHandler {
//
// /**
// * 处理所有不可知的异常
// */
// @ExceptionHandler(Throwable.class)
// public ResponseEntity<ApiError> handleException(Throwable e){
// // 打印堆栈信息
// log.error(ThrowableUtil.getStackTrace(e));
// return buildResponseEntity(ApiError.error(e.getMessage()));
// }
//
// /**
// * BadCredentialsException
// */
// @ExceptionHandler(BadCredentialsException.class)
// public ResponseEntity<ApiError> badCredentialsException(BadCredentialsException e){
// // 打印堆栈信息
// String message = "坏的凭证".equals(e.getMessage()) ? "用户名或密码不正确" : e.getMessage();
// log.error(message);
// return buildResponseEntity(ApiError.error(message));
// }
//
// /**
// * 处理自定义异常
// */
// @ExceptionHandler(value = BadRequestException.class)
// public ResponseEntity<ApiError> badRequestException(BadRequestException e) {
// // 打印堆栈信息
// log.error(ThrowableUtil.getStackTrace(e));
// return buildResponseEntity(ApiError.error(e.getStatus(),e.getMessage()));
// }
//
// /**
// * 处理自定义异常
// * @param e
// * @return
// */
// @ExceptionHandler(value = ErrorRequestException.class)
// public ResponseEntity<ApiErr> errorRequestException(ErrorRequestException e) {
// // 打印堆栈信息
// log.error(ThrowableUtil.getStackTrace(e));
// ApiErr apiError = new ApiErr(e.getStatus(),e.getMessage());
// return buildResponseEntity2(apiError);
// }
//
// /**
// * 处理 EntityExist
// */
// @ExceptionHandler(value = EntityExistException.class)
// public ResponseEntity<ApiError> entityExistException(EntityExistException e) {
// // 打印堆栈信息
// log.error(ThrowableUtil.getStackTrace(e));
// return buildResponseEntity(ApiError.error(e.getMessage()));
// }
//
// /**
// * 处理 EntityNotFound
// */
// @ExceptionHandler(value = EntityNotFoundException.class)
// public ResponseEntity<ApiError> entityNotFoundException(EntityNotFoundException e) {
// // 打印堆栈信息
// log.error(ThrowableUtil.getStackTrace(e));
// return buildResponseEntity(ApiError.error(NOT_FOUND.value(),e.getMessage()));
// }
//
// /**
// * 处理所有接口数据验证异常
// */
// @ExceptionHandler(MethodArgumentNotValidException.class)
// public ResponseEntity<ApiError> handleMethodArgumentNotValidException(MethodArgumentNotValidException e){
// // 打印堆栈信息
// log.error(ThrowableUtil.getStackTrace(e));
// String[] str = Objects.requireNonNull(e.getBindingResult().getAllErrors().get(0).getCodes())[1].split("\\.");
// String message = e.getBindingResult().getAllErrors().get(0).getDefaultMessage();
// String msg = "不能为空";
// if(msg.equals(message)){
// message = str[1] + ":" + message;
// }
// return buildResponseEntity(ApiError.error(message));
// }
//
// /**
// * 统一返回
// */
// private ResponseEntity<ApiError> buildResponseEntity(ApiError apiError) {
// return new ResponseEntity<>(apiError, valueOf(apiError.getStatus()));
// }
//
// /**
// * 统一返回
// * @param apiError
// * @return
// */
// private ResponseEntity<ApiErr> buildResponseEntity2(ApiErr apiError) {
// return new ResponseEntity(apiError, HttpStatus.valueOf(apiError.getStatus()));
// }
//}

2
yshop-common/src/main/resources/dozer/global-configuration.xml
View File

@ -8,7 +8,7 @@
<trim-strings>false</trim-strings>
<!-- 自定义的枚举与Integer转换器, 下节介绍 -->
<!--<custom-converters>
<converter type="com.dongao.beacon.ds.web.admin.tookit.EnumIntegerBiDirectionalDozerConverter">
<converter type="com.dongao.beacon.ds.rest.admin.tookit.EnumIntegerBiDirectionalDozerConverter">
<class-a>java.lang.Enum</class-a>
<class-b>java.lang.Integer</class-b>
</converter>

2
yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java
View File

@ -129,7 +129,7 @@ public class GenUtil {
templates = getFrontTemplateNames();
for (String templateName : templates) {
Template template = engine.getTemplate("generator/front/"+templateName+".ftl");
String path = tempPath + "yshop-web" + File.separator;
String path = tempPath + "yshop-rest" + File.separator;
String apiPath = path + "src" + File.separator + "api" + File.separator;
String srcPath = path + "src" + File.separator + "views" + File.separator + genMap.get("changeClassName").toString() + File.separator;
String filePath = getFrontFilePath(templateName, apiPath, srcPath, genMap.get("changeClassName").toString());

43
yshop-mall/src/main/java/co/yixiang/modules/manage/service/YxExpressService.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.manage.service;
//
//import co.yixiang.commonold.service.BaseService;
//import co.yixiang.commonold.web.vo.Paging;
//import co.yixiang.modules.manage.entity.YxExpress;
//import co.yixiang.modules.manage.web.param.YxExpressQueryParam;
//import co.yixiang.modules.manage.web.vo.YxExpressQueryVo;
//
//import java.io.Serializable;
//
///**
// * <p>
// * 快递公司表 服务类
// * </p>
// *
// * @author hupeng
// * @since 2019-12-13
// */
//public interface YxExpressService extends BaseService<YxExpress> {
//
// /**
// * 根据ID获取查询对象
// * @param id
// * @return
// */
// YxExpressQueryVo getYxExpressById(Serializable id);
//
// /**
// * 获取分页对象
// * @param yxExpressQueryParam
// * @return
// */
// Paging<YxExpressQueryVo> getYxExpressPageList(YxExpressQueryParam yxExpressQueryParam) throws Exception;
//
//}

19
yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java
View File

@ -83,20 +83,13 @@ public class YxUserRechargeServiceImpl extends BaseServiceImpl<UserRechargeMappe
//最终充值金额
BigDecimal newPrice = NumberUtil.add(userRecharge.getPrice(),user.getNowMoney());
// newPrice = NumberUtil.add(userRecharge.getGivePrice(),newPrice);
//增加流水
YxUserBill userBill = new YxUserBill();
userBill.setUid(userRecharge.getUid());
userBill.setTitle("用户余额充值");
userBill.setLinkId(userRecharge.getId().toString());
userBill.setCategory(BillDetailEnum.CATEGORY_1.getValue());
userBill.setType(BillDetailEnum.TYPE_1.getValue());
userBill.setNumber(userRecharge.getPrice());
userBill.setBalance(newPrice);
userBill.setMark("成功充值余额"+userRecharge.getPrice());
userBill.setStatus(BillEnum.STATUS_1.getValue());
userBill.setPm(BillEnum.PM_1.getValue());
billService.save(userBill);
billService.income(userRecharge.getUid(),"用户余额充值",BillDetailEnum.CATEGORY_1.getValue(),
BillDetailEnum.TYPE_1.getValue(),userRecharge.getPrice().doubleValue(),newPrice.doubleValue(),
"成功充值余额"+userRecharge.getPrice(),userRecharge.getId().toString());
//update 余额
user.setNowMoney(newPrice);