新增用户PV值接口

commons-pojo/src/main/java/com/bjtdba/entity/userCenter/UserAddress.java

@@ -75,6 +75,34 @@ public class UserAddress implements Serializable {
      * 地址id（regions）
      */
     private String codeList;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+    /**
+     * pv值
+     */
+    private Long pv;
+    /**
+     * pv状态
+     */
+    private Integer status;
+    /**
+     * pv值获得来源备注
+     */
+    private String mark;
+    /**
+     * 订单类型
+     */
+    private String orderType;
+    /**
+     * pv值(还是订单？)结算时间
+     */
+    private Date settlenmentTime;
+    /**
+     * pv值(?)添加时间
+     */
+    private Integer addtime;
 
 
     public Integer getAddressId() {
@@ -205,5 +233,66 @@ public class UserAddress implements Serializable {
         this.codeList = codeList;
     }
 
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public Long getPv() {
+        return pv;
+    }
+
+    public void setPv(Long pv) {
+        this.pv = pv;
+    }
+
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+
+    public String getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(String orderType) {
+        this.orderType = orderType;
+    }
+
+
+    public Date getSettlenmentTime() {
+        return settlenmentTime;
+    }
+
+    public void setSettlenmentTime(Date settlenmentTime) {
+        this.settlenmentTime = settlenmentTime;
+    }
+
+    public Integer getAddtime() {
+        return addtime;
+    }
+
+    public void setAddtime(Integer addtime) {
+        this.addtime = addtime;
+    }
+
+
+
+
 }
 

userCenter_service/src/main/java/com/bjtdba/userCenter/controller/UserController.java

@@ -7,6 +7,10 @@ import com.bjtdba.entity.userCenter.UserBill;
 import com.bjtdba.entity.userCenter.UserCertification;
 import com.bjtdba.userCenter.dto.request.*;
 import com.bjtdba.userCenter.dto.response.UserContributeModifyResponse;
+import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.request.ModifyPVRequest;
+import com.bjtdba.userCenter.dto.request.UserScoreModifyRequest;
+import com.bjtdba.userCenter.dto.response.ModifyPVResponse;
 import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
 import com.bjtdba.userCenter.dto.response.common.ApiResponse;
 import com.bjtdba.userCenter.dto.response.common.PageResult;
@@ -627,4 +631,12 @@ public class UserController {
     public ApiResponse<UserContributeModifyResponse> modifyUserContribute(@Validated @RequestBody UserContributeModifyRequest request) {
         return ApiResponse.success(userService.modifyUserContribute(request));
     }
+
+    @PostMapping("/modifyPV")
+    public ApiResponse<ModifyPVResponse> modifyUserPV(
+            @Validated @RequestBody ModifyPVRequest request) {
+        return ApiResponse.success(userService.modifyUserPV(request));
+}
+
+
 }

userCenter_service/src/main/java/com/bjtdba/userCenter/dao/UserPvLogDao.java

@@ -0,0 +1,11 @@
+package com.bjtdba.userCenter.dao;
+import com.bjtdba.userCenter.entity.UserPvLogEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Mapper
+public interface UserPvLogDao {
+     int insertByEntity(UserPvLogEntity entity);
+
+}

userCenter_service/src/main/java/com/bjtdba/userCenter/dao/UserSignScoreDao.java

@@ -93,5 +93,6 @@ public interface UserSignScoreDao {
 
     int insertByEntity(UserSignScoreEntity record);
 
+
 }
 

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/request/ModifyPVRequest.java

@@ -0,0 +1,29 @@
+package com.bjtdba.userCenter.dto.request;
+
+import lombok.Data;
+import javax.validation.constraints.*;
+import java.math.BigDecimal;
+
+@Data
+public class ModifyPVRequest {
+    private Integer uid;
+
+    @NotNull(message = "pv值不能为空")
+    @DecimalMin(value = "0.00", message = "pv值不能为负数")
+    private BigDecimal pv;
+
+    @Min(value = -1, message = "状态值错误")
+    @Max(value = 1,message = "状态值错误")
+    private Integer status; // pv状态1-有效 0-失效 -1待确认
+
+    private String mark;
+
+    @NotBlank(message = "订单ID不能为空")
+    @Size(max = 255, message = "订单ID长度超限")
+    private String orderId;
+
+    @NotBlank(message = "订单类型不能为空")
+    @Size(max = 255, message = "订单类型长度超限")
+    private String orderType;
+
+}

userCenter_service/src/main/java/com/bjtdba/userCenter/dto/response/ModifyPVResponse.java

@@ -0,0 +1,20 @@
+package com.bjtdba.userCenter.dto.response;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+@Data
+@Builder
+public class ModifyPVResponse {
+    private Integer id;
+    private Integer uid;
+    private BigDecimal pv;
+    private Integer status;
+    private String mark;
+    private String orderId;
+    private String orderType;
+    private Timestamp settlementTime;
+}

userCenter_service/src/main/java/com/bjtdba/userCenter/entity/UserPvLogEntity.java

@@ -0,0 +1,20 @@
+package com.bjtdba.userCenter.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+@Data
+public class UserPvLogEntity {
+    private Integer id;
+    private Integer uid;
+    private BigDecimal pv;
+    private Integer status;
+    private String mark;
+    private String orderId;
+    private String orderType;
+    private Timestamp settlementTime;
+    private Long addtime;
+}
+

userCenter_service/src/main/java/com/bjtdba/userCenter/service/UserAddressService.java

@@ -28,6 +28,7 @@ public interface UserAddressService {
      */
 //    Page<UserAddress> queryByPage(UserAddress userAddress, PageRequest pageRequest);
     public List<UserAddress> queryListByObj(UserAddress userAddress);
+
     /**
      * 新增数据
      *
@@ -51,5 +52,4 @@ public interface UserAddressService {
      * @return 是否成功
      */
     boolean deleteById(Integer addressId);
-
 }

userCenter_service/src/main/java/com/bjtdba/userCenter/service/UserService.java

@@ -2,6 +2,10 @@ package com.bjtdba.userCenter.service;
 
 import com.bjtdba.entity.order.User;
 import com.bjtdba.entity.userCenter.UserBill;
+import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.request.ModifyPVRequest;
+import com.bjtdba.userCenter.dto.request.UserScoreModifyRequest;
+import com.bjtdba.userCenter.dto.response.ModifyPVResponse;
 import com.bjtdba.userCenter.dto.request.*;
 import com.bjtdba.userCenter.dto.response.UserContributeModifyResponse;
 import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
@@ -45,6 +49,8 @@ public interface UserService {
 
     UserScoreModifyResponse modifyUserScore(UserScoreModifyRequest request);
 
+    ModifyPVResponse modifyUserPV(ModifyPVRequest request);
+
     UserContributeModifyResponse modifyUserContribute(UserContributeModifyRequest request);
 
     UserDTO createUserInfo(CreateUserInfoRequest request);

userCenter_service/src/main/java/com/bjtdba/userCenter/service/impl/UserAddressServiceImpl.java

@@ -80,4 +80,17 @@ public class UserAddressServiceImpl implements UserAddressService {
     public boolean deleteById(Integer addressId) {
         return this.userAddressDao.deleteById(addressId) > 0;
     }
+
+    /**
+     * 插入pv记录
+     *
+     * @param userAddress 包含pv记录的实体对象
+     * @return 是否成功
+     */
+    @Override
+    public boolean insertPvLog(UserAddress userAddress) {
+        return userAddressDao.insertPvLog(userAddress) > 0;
+    }
+
+
 }

userCenter_service/src/main/java/com/bjtdba/userCenter/service/impl/UserServiceImpl.java

@@ -5,10 +5,15 @@ import com.bjtdba.entity.userCenter.UserBill;
 import com.bjtdba.userCenter.dao.*;
 import com.bjtdba.userCenter.dto.request.*;
 import com.bjtdba.userCenter.dto.response.UserContributeModifyResponse;
+import com.bjtdba.userCenter.dto.request.GetUserListRequest;
+import com.bjtdba.userCenter.dto.request.ModifyPVRequest;
+import com.bjtdba.userCenter.dto.request.UserScoreModifyRequest;
+import com.bjtdba.userCenter.dto.response.ModifyPVResponse;
 import com.bjtdba.userCenter.dto.response.UserScoreModifyResponse;
 import com.bjtdba.userCenter.dto.response.common.PageResult;
 import com.bjtdba.userCenter.dto.response.UserDTO;
 import com.bjtdba.userCenter.entity.UserEntity;
+import com.bjtdba.userCenter.entity.UserPvLogEntity;
 import com.bjtdba.userCenter.entity.UserSignGongxianEntity;
 import com.bjtdba.userCenter.entity.UserSignScoreEntity;
 import com.bjtdba.userCenter.exception.BusinessException;
@@ -21,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
@@ -41,6 +47,8 @@ public class UserServiceImpl  implements UserService {
     @Autowired
     private UserDao userDao;
     @Autowired
+    private UserPvLogDao userPvLogDao;
+    @Autowired
     private UserSignScoreDao userSignScoreDao;
     @Autowired
     private UserSignGongxianDao userSignGongxianDao;
@@ -48,6 +56,7 @@ public class UserServiceImpl  implements UserService {
     private HttpServletRequest httpServletRequest;
 
 
+
     public User queryByid(Integer uid){
         return  userInfoDao.queryByid(uid);
     }
@@ -360,4 +369,35 @@ public class UserServiceImpl  implements UserService {
         }
         return convertToUserDTO(userEntity);
     }
+
+    @Override
+    public ModifyPVResponse modifyUserPV(ModifyPVRequest request) {
+        UserPvLogEntity record = buildModifyPVRecord(request);
+        record.setAddtime(LocalDateTime.now().toEpochSecond(ZoneOffset.UTC));
+        userPvLogDao.insertByEntity(record);
+
+        return ModifyPVResponse.builder()
+                .id(record.getId())
+                .uid(record.getUid())
+                .orderId(record.getOrderId())
+                .pv(record.getPv())
+                .status(record.getStatus())
+                .mark(record.getMark())
+                .orderType(record.getOrderType())
+                .settlementTime(record.getSettlementTime())
+                .build();
+    }
+        private UserPvLogEntity buildModifyPVRecord(ModifyPVRequest request) {
+            UserPvLogEntity record = new UserPvLogEntity();
+            record.setUid(request.getUid());
+            record.setPv(request.getPv());
+            record.setStatus(request.getStatus());
+            record.setMark(request.getMark());
+            record.setOrderId(request.getOrderId());
+            record.setOrderType(request.getOrderType());
+            if (request.getStatus() == 1) {
+                record.setSettlementTime(Timestamp.valueOf(LocalDateTime.now()));
+            }
+            return record;
+    }
 }

userCenter_service/src/main/resources/mapper/UserPvLogMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.bjtdba.userCenter.dao.UserPvLogDao">
+
+    <insert id="insertByEntity"
+            parameterType="com.bjtdba.userCenter.entity.UserPvLogEntity"
+            useGeneratedKeys="true"
+            keyProperty="id">
+
+
+    INSERT INTO rrx_user_pv_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+        <if test="uid != null">uid,</if>
+        <if test="pv != null">pv,</if>
+        <if test="status != null">status,</if>
+        <if test="mark != null">mark,</if>
+        <if test="orderId != null">order_id,</if>
+        <if test="orderType != null">order_type,</if>
+        <if test="settlementTime != null">settlement_time,</if>
+        <if test="addtime != null">addtime,</if>
+    </trim>
+    <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+        <if test="uid != null">#{uid},</if>
+        <if test="pv != null">#{pv},</if>
+        <if test="status != null">#{status},</if>
+        <if test="mark != null">#{mark},</if>
+        <if test="orderId != null">#{orderId},</if>
+        <if test="orderType != null">#{orderType},</if>
+        <if test="settlementTime != null">#{settlementTime},</if>
+        <if test="addtime != null">#{addtime},</if>
+    </trim>
+    </insert>
+</mapper>