代码优化

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/factory/RemoteVipOrderFallbackFactory.java

@@ -1,7 +1,7 @@
 package com.bnyer.order.api.factory;
 
 import com.bnyer.common.core.domain.R;
-import com.bnyer.order.api.dto.QueryVipOrderDto;
+import com.bnyer.order.api.query.VipOrderQuery;
 import com.bnyer.order.api.remote.RemoteVipOrderService;
 import com.bnyer.order.api.vo.VipOrderVo;
 import org.slf4j.Logger;
@@ -28,7 +28,7 @@ public class RemoteVipOrderFallbackFactory implements FallbackFactory<RemoteVipO
         return new RemoteVipOrderService() {
 
             @Override
-            public R<List<VipOrderVo>> getVipOrderList(QueryVipOrderDto dto) {
+            public R<List<VipOrderVo>> queryVipOrderList(VipOrderQuery query) {
                 return R.fail("获取会员订单信息失败:+"+throwable.getMessage());
             }
         };

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/dto/QueryVipOrderDto.java → bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/query/VipOrderQuery.java

@@ -1,4 +1,4 @@
-package com.bnyer.order.api.dto;
+package com.bnyer.order.api.query;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -15,7 +15,7 @@ import java.io.Serializable;
 @Getter
 @Setter
 @NoArgsConstructor
-public class QueryVipOrderDto implements Serializable {
+public class VipOrderQuery implements Serializable {
 
     @ApiModelProperty(value="订单号")
     private String orderNo;

bnyer-api/bnyer-api-order/src/main/java/com/bnyer/order/api/remote/RemoteVipOrderService.java

@@ -2,7 +2,7 @@ package com.bnyer.order.api.remote;
 
 import com.bnyer.common.core.constant.ServiceNameConstants;
 import com.bnyer.common.core.domain.R;
-import com.bnyer.order.api.dto.QueryVipOrderDto;
+import com.bnyer.order.api.query.VipOrderQuery;
 import com.bnyer.order.api.factory.RemoteVipOrderFallbackFactory;
 import com.bnyer.order.api.vo.VipOrderVo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -21,9 +21,9 @@ public interface RemoteVipOrderService {
 
     /**
      * 获取会员订单信息
-     * @param dto
+     * @param query
      * @return
      */
-    @PostMapping("/vip/getVipOrderList")
+    @PostMapping("/vip/queryVipOrderList")
-    R<List<VipOrderVo>> getVipOrderList(@RequestBody QueryVipOrderDto dto);
+    R<List<VipOrderVo>> queryVipOrderList(@RequestBody VipOrderQuery query);
 }

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/domain/UserVipRecord.java

@@ -63,10 +63,10 @@ public class UserVipRecord extends BaseDomain {
     private Date endTime;
 
     /**
-     * 支付状态(0->待支付;1->已支付;2->支付失败;3->支付异常)
+     * 状态(0->已到期;1->已生效)
      */
     @TableField(value = "status")
-    @ApiModelProperty(value="支付状态(0->待支付;1->已支付;2->支付失败;3->支付异常)")
+    @ApiModelProperty(value="状态(0->已到期;1->已生效;)")
     private Integer status;
 
     /**

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/AddUserVipRecordDto.java

@@ -1,5 +1,6 @@
 package com.bnyer.common.core.dto;
 
+import com.bnyer.common.core.domain.UserVipRecord;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -8,10 +9,8 @@ import java.util.Date;
 
 @Getter
 @Setter
-@ToString
-@AllArgsConstructor
 @NoArgsConstructor
-public class AddUserVipRecordDto {
+public class AddUserVipRecordDto extends BaseDto<UserVipRecord>{
 
     @ApiModelProperty(value="订单号")
     private String orderNo;

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/dto/BaseDto.java

@@ -0,0 +1,85 @@
+package com.bnyer.common.core.dto;
+
+import cn.hutool.core.util.IdUtil;
+import com.bnyer.common.core.domain.BaseDomain;
+import com.bnyer.common.core.utils.StringUtils;
+import com.bnyer.common.core.utils.bean.ReflectUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author :WXC
+ * @Date :2023/05/10
+ * @description :
+ */
+@Data
+public class BaseDto <T extends BaseDomain> implements Serializable {
+    private static final long serialVersionUID = 320272502336434381L;
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 数据创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 数据更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /**
+     * 是否显示
+     */
+    private String isShow;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 主键ID集合
+     */
+    private List<Long> ids;
+
+    /**
+     * 转为实体类
+     *
+     * @return 实体类
+     */
+    public T toEntity() {
+        Class<T> entity = ReflectUtils.getParameterizedType(this.getClass());
+        T entityInstance = ReflectUtils.newInstance(entity);
+        BeanUtils.copyProperties(this, entityInstance);
+        if (this.id == null) {
+            entityInstance.setId(IdUtil.getSnowflakeNextId());
+            entityInstance.setIsShow("1");
+            entityInstance.setCreateTime(new Date());
+            entityInstance.setUpdateTime(null);
+            if (StringUtils.isNotBlank(this.isShow)){
+                entityInstance.setIsShow(this.isShow);
+            }else {
+                entityInstance.setIsShow("1");
+            }
+            if (this.sort != null){
+                entityInstance.setSort(this.sort);
+            }else {
+                entityInstance.setSort(0);
+            }
+        } else {
+            entityInstance.setUpdateTime(new Date());
+        }
+        return entityInstance;
+    }
+}

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/utils/bean/ReflectUtils.java

@@ -0,0 +1,45 @@
+package com.bnyer.common.core.utils.bean;
+
+import org.springframework.beans.BeanInstantiationException;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+/**
+ * @author :WXC
+ * @Date :2023/05/10
+ * @description :反射工具
+ */
+public class ReflectUtils {
+
+    /**
+     * 得到传入类中当前指定得泛型
+     *
+     * @param cls 待解析得类
+     * @return 显示指定的泛型
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Class<T> getParameterizedType(Class cls) {
+        Type genType = cls.getGenericSuperclass();
+        Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
+        return (Class<T>) params[0];
+    }
+
+
+    /**
+     * 实例化class 对象
+     *
+     * @param cls 待实例化类
+     * @param <T> 类类型
+     * @return 实例化对象
+     */
+    public static <T> T newInstance(Class<T> cls) {
+        try {
+            return cls.newInstance();
+        } catch (Exception e) {
+            throw new BeanInstantiationException(cls, e.getMessage());
+        }
+    }
+
+
+}

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/UserVipServiceRecordImpl.java

@@ -87,10 +87,8 @@ public class UserVipServiceRecordImpl implements UserVipRecordService {
 
     @Override
     public void addUserVipRecord(AddUserVipRecordDto dto) {
-        UserVipRecord userVipRecord = EntityConvertUtil.copy(dto, UserVipRecord.class);
+        UserVipRecord userVipRecord = dto.toEntity();
         userVipRecord.setStatus(EnumUserVipRecordStatus.VALID.getStatus());
-        userVipRecord.setCreateTime(new Date());
-        userVipRecord.setIsShow("1");
         userVipRecordMapper.insert(userVipRecord);
     }
 }

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/controller/VipOrderController.java

@@ -3,7 +3,7 @@ package com.bnyer.order.controller;
 import com.bnyer.common.core.domain.R;
 import com.bnyer.common.core.web.controller.BaseController;
 import com.bnyer.order.dto.AddVipOrderDto;
-import com.bnyer.order.dto.QueryVipOrderDto;
+import com.bnyer.order.query.VipOrderQuery;
 import com.bnyer.order.service.VipOrderService;
 import com.bnyer.order.vo.VipOrderVo;
 import io.swagger.annotations.Api;
@@ -44,10 +44,10 @@ public class VipOrderController extends BaseController {
     /**
      * 查询订单信息
      */
-    @PostMapping("/getVipOrderList")
+    @PostMapping("/queryVipOrderList")
     @Operation(summary = "查询会员订单列表信息" , description = "查询会员订单列表信息")
-    public R<List<VipOrderVo>> getVipOrderList(@Valid @RequestBody QueryVipOrderDto dto) {
+    public R<List<VipOrderVo>> queryVipOrderList(@Valid @RequestBody VipOrderQuery query) {
-        List<VipOrderVo> vipOrderVoList = vipOrderService.getVipOrderList(dto);
+        List<VipOrderVo> vipOrderVoList = vipOrderService.queryVipOrderList(query);
         return R.ok(vipOrderVoList);
     }
 

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/dto/AddVipOrderDto.java

@@ -1,5 +1,7 @@
 package com.bnyer.order.dto;
 
+import com.bnyer.common.core.domain.VipOrder;
+import com.bnyer.common.core.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -17,7 +19,7 @@ import java.io.Serializable;
 @Getter
 @Setter
 @NoArgsConstructor
-public class AddVipOrderDto implements Serializable {
+public class AddVipOrderDto extends BaseDto<VipOrder> implements Serializable {
 
     @NotBlank(message = "手机号不能为空！")
     @ApiModelProperty(value="手机号")

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/mapper/VipOrderMapper.java

@@ -2,7 +2,7 @@ package com.bnyer.order.mapper;
 
 import java.util.List;
 
-import com.bnyer.order.dto.QueryVipOrderDto;
+import com.bnyer.order.query.VipOrderQuery;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.bnyer.common.core.domain.VipOrder;
@@ -20,7 +20,7 @@ public interface VipOrderMapper extends BaseMapper<VipOrder> {
      * @param dto
      * @return
      */
-    List<VipOrder> queryVipOrderList(QueryVipOrderDto dto);
+    List<VipOrder> queryVipOrderList(VipOrderQuery dto);
 
     /**
      * 取消订单

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/query/VipOrderDetailsQuery.java

@@ -1,10 +1,12 @@
 package com.bnyer.order.query;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @author :WXC
  * @Date :2023/05/09
@@ -12,8 +14,9 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@Builder
+@NoArgsConstructor
 public class VipOrderDetailsQuery {
+    @NotBlank(message = "订单号不能为空")
     @ApiModelProperty(value="订单号")
     private String orderNo;
 }

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/dto/QueryVipOrderDto.java → bnyer-services/bnyer-order/src/main/java/com/bnyer/order/query/VipOrderQuery.java

@@ -1,4 +1,4 @@
-package com.bnyer.order.dto;
+package com.bnyer.order.query;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -15,7 +15,7 @@ import java.io.Serializable;
 @Getter
 @Setter
 @NoArgsConstructor
-public class QueryVipOrderDto implements Serializable {
+public class VipOrderQuery implements Serializable {
 
     @ApiModelProperty(value="订单号")
     private String orderNo;

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/VipOrderService.java

@@ -2,7 +2,7 @@ package com.bnyer.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bnyer.common.core.domain.VipOrder;
-import com.bnyer.order.dto.QueryVipOrderDto;
+import com.bnyer.order.query.VipOrderQuery;
 import com.bnyer.order.dto.AddVipOrderDto;
 import com.bnyer.order.query.VipOrderDetailsQuery;
 import com.bnyer.order.vo.VipOrderDetailsVo;
@@ -34,10 +34,10 @@ public interface VipOrderService extends IService<VipOrder> {
 
     /**
      * 查询会员订单列表信息
-     * @param dto
+     * @param query
      * @return
      */
-    List<VipOrderVo> getVipOrderList(QueryVipOrderDto dto);
+    List<VipOrderVo> queryVipOrderList(VipOrderQuery query);
 
     /**
      * 查询会员订单详情

bnyer-services/bnyer-order/src/main/java/com/bnyer/order/service/impl/VipOrderServiceImpl.java

@@ -21,7 +21,7 @@ import com.bnyer.img.api.remote.RemoteWxMiniService;
 import com.bnyer.img.api.vo.UserVipInfoVo;
 import com.bnyer.order.dto.AddVipOrderDto;
 import com.bnyer.order.query.VipOrderDetailsQuery;
-import com.bnyer.order.dto.QueryVipOrderDto;
+import com.bnyer.order.query.VipOrderQuery;
 import com.bnyer.order.enums.EnumVipOrderStatus;
 import com.bnyer.order.mapper.VipOrderMapper;
 import com.bnyer.order.service.VipOrderService;
@@ -60,12 +60,12 @@ public class VipOrderServiceImpl extends ServiceImpl<VipOrderMapper, VipOrder> i
 
     /**
      * 查询会员订单列表信息
-     * @param dto
+     * @param query
      * @return
      */
     @Override
-    public List<VipOrderVo> getVipOrderList(QueryVipOrderDto dto) {
+    public List<VipOrderVo> queryVipOrderList(VipOrderQuery query) {
-        List<VipOrder> vipOrderList = vipOrderMapper.queryVipOrderList(dto);
+        List<VipOrder> vipOrderList = vipOrderMapper.queryVipOrderList(query);
         List<VipOrderVo> vipOrderVoList = EntityConvertUtil.copy(vipOrderList, VipOrderVo.class);
         return vipOrderVoList;
     }
@@ -155,16 +155,15 @@ public class VipOrderServiceImpl extends ServiceImpl<VipOrderMapper, VipOrder> i
      * @return
      */
     private VipOrder buildImgVipOrder(UserVipInfoVo userVipInfoVo, AddVipOrderDto addVipOrderDto) {
+        VipOrder vipOrder = addVipOrderDto.toEntity();
         UserInfoVo userInfo = SecurityUtils.getUserInfo();
         Long userId = userInfo.getId();
         Integer userClientType = userInfo.getUserClientType();
-        VipOrder vipOrder = new VipOrder();
-        vipOrder.setVipId(userVipInfoVo.getId());
         vipOrder.setVipCode(userVipInfoVo.getVipCode());
         vipOrder.setVipName(userVipInfoVo.getVipName());
         vipOrder.setVipTypeName(userVipInfoVo.getVipTypeName());
+        //// TODO: 2023/05/10 待加密
         vipOrder.setPhone(addVipOrderDto.getPhone());
-        vipOrder.setVipId(addVipOrderDto.getVipId());
         vipOrder.setVipName(userVipInfoVo.getVipName());
         vipOrder.setVipTypeName(userVipInfoVo.getVipTypeName());
         vipOrder.setPayAmount(userVipInfoVo.getPrice());
@@ -180,7 +179,6 @@ public class VipOrderServiceImpl extends ServiceImpl<VipOrderMapper, VipOrder> i
         vipOrder.setDays((int) DateUtil.betweenDay(vipOrder.getStartTime(), vipOrder.getEndTime(), true));
         vipOrder.setUserClientType(userClientType);
         vipOrder.setOrderNo(OrderUtil.getOrderNo("RV",nowDate, EnumUserClientType.getCodeByType(userClientType),String.valueOf(userId)));
-        vipOrder.setCreateTime(nowDate);
         return vipOrder;
     }
 
@@ -210,7 +208,6 @@ public class VipOrderServiceImpl extends ServiceImpl<VipOrderMapper, VipOrder> i
      * 更新订单信息为已支付
      * @param vipOrder
      */
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public void updateByToPaySuccess(VipOrder vipOrder) {
         vipOrder.setPayStatus(EnumPayStatus.SUCCESS.getStatus());

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/dto/AddPayInfoDto.java

@@ -1,6 +1,8 @@
 package com.bnyer.pay.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.bnyer.common.core.domain.PayInfo;
+import com.bnyer.common.core.dto.BaseDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -19,7 +21,7 @@ import java.util.Date;
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class AddPayInfoDto {
+public class AddPayInfoDto extends BaseDto<PayInfo> {
 
     @ApiModelProperty(value="支付单号(内部生成)")
     private String payId;

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/PayInfoServiceImpl.java

@@ -48,9 +48,7 @@ public class PayInfoServiceImpl extends ServiceImpl<PayInfoMapper, PayInfo> impl
      */
     @Override
     public void addPayInfo(AddPayInfoDto dto) {
-        PayInfo payInfo = EntityConvertUtil.copy(dto, PayInfo.class);
+        PayInfo payInfo = dto.toEntity();
-        payInfo.setCreateTime(new Date());
-        payInfo.setIsShow("1");
         payInfoMapper.insert(payInfo);
     }
 

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java

@@ -8,7 +8,7 @@ import com.bnyer.common.core.utils.bean.EntityConvertUtil;
 import com.bnyer.common.core.utils.ip.IpUtils;
 import com.bnyer.common.core.vo.UserInfoVo;
 import com.bnyer.common.security.utils.SecurityUtils;
-import com.bnyer.order.api.dto.QueryVipOrderDto;
+import com.bnyer.order.api.query.VipOrderQuery;
 import com.bnyer.order.api.remote.RemoteVipOrderService;
 import com.bnyer.order.api.vo.VipOrderVo;
 import com.bnyer.pay.bo.QueryOrderBo;
@@ -71,10 +71,10 @@ public class UnifiedPayServiceImpl implements UnifiedPayService {
         switch (enumSceneCode){
             //会员充值场景
             case VIP_RECHARGE:
-                QueryVipOrderDto queryVipOrderDto = new QueryVipOrderDto();
+                VipOrderQuery vipOrderQuery = new VipOrderQuery();
-                queryVipOrderDto.setOrderNo(dto.getOrderNo());
+                vipOrderQuery.setOrderNo(dto.getOrderNo());
                 //查询会员业务订单信息
-                R<List<VipOrderVo>> vipOrderVoListR = remoteVipOrderService.getVipOrderList(queryVipOrderDto);
+                R<List<VipOrderVo>> vipOrderVoListR = remoteVipOrderService.queryVipOrderList(vipOrderQuery);
                 if (!vipOrderVoListR.isSuccess()){
                     throw new ServiceException(vipOrderVoListR.getMsg());
                 }