Merge branch 'lyh-task-incType'

src/main/java/com/fdkankan/ucenter/controller/IncrementController.java

@@ -25,11 +25,8 @@ public class IncrementController extends BaseController {
     IIncrementTypeService incrementTypeService;
 
     @GetMapping("/getIncrementType")
-    public Result getIncrementType(@RequestParam (required = false) String type){
-        if(StringUtils.isEmpty(type)){
-            type = "cn";
-        }
-        return Result.success(incrementTypeService.getByType(type));
+    public Result getIncrementType(){
+        return Result.success(incrementTypeService.list());
     }
 
     @PostMapping("/findIncrementList")

src/main/java/com/fdkankan/ucenter/entity/CameraDetail.java

@@ -146,5 +146,7 @@ public class CameraDetail implements Serializable {
     @TableField("last_request_time")
     private Date lastRequestTime;
 
+    @TableField("unit")
+    private String unit;
 
 }

src/main/java/com/fdkankan/ucenter/entity/IncrementType.java

@@ -17,7 +17,7 @@ import lombok.Setter;
  * </p>
  *
  * @author 
- * @since 2022-08-01
+ * @since 2023-06-19
  */
 @Getter
 @Setter
@@ -35,6 +35,9 @@ public class IncrementType implements Serializable {
     @TableField("name")
     private String name;
 
+    /**
+     * member会员,freeMember免费会员
+     */
     @TableField("type")
     private String type;
 
@@ -43,8 +46,9 @@ public class IncrementType implements Serializable {
      */
     @TableField("download_num")
     private Integer downloadNum;
+
     /**
-     * 下载次数，-1代表无限次
+     * 下载价格
      */
     @TableField("download_price")
     private BigDecimal downloadPrice;
@@ -56,6 +60,12 @@ public class IncrementType implements Serializable {
     private Integer cameraCapacity;
 
     /**
+     * 相机容量单位
+     */
+    @TableField("camera_space")
+    private Integer cameraSpace;
+
+    /**
      * 购买之后，有效期天数，-1代表无限制
      */
     @TableField("valid_time")
@@ -79,15 +89,66 @@ public class IncrementType implements Serializable {
     @TableField("symbol")
     private String symbol;
 
-    @TableField("create_time")
-    private String createTime;
+    /**
+     * 自定义logo
+     */
+    @TableField("custom_logo")
+    private Boolean customLogo;
 
-    @TableField("update_time")
-    private String updateTime;
+    /**
+     * 自定义热点样式
+     */
+    @TableField("custom_style")
+    private Boolean customStyle;
+
+    /**
+     * 空间贴图
+     */
+    @TableField("custom_image")
+    private Boolean customImage;
+
+    /**
+     * 三维模型
+     */
+    @TableField("custom_model")
+    private Boolean customModel;
+
+    /**
+     * 场景美化调节
+     */
+    @TableField("custom_scene")
+    private Boolean customScene;
+
+    /**
+     * 场景复制
+     */
+    @TableField("custom_copy")
+    private Boolean customCopy;
+
+    /**
+     * 场景计算
+     */
+    @TableField("custom_modeling")
+    private Integer customModeling;
+
+    /**
+     * 场景下载
+     */
+    @TableField("custom_down")
+    private Integer customDown;
 
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 权益价格
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
 
 }

src/main/java/com/fdkankan/ucenter/entity/User.java

@@ -148,5 +148,4 @@ public class User implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
-
 }

src/main/java/com/fdkankan/ucenter/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"ucenter", getTables(new String[]{
-                "t_scene_del_log",
+                "t_increment_type",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/ucenter/mapper/IIncrementTypeMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author 
- * @since 2022-08-01
+ * @since 2023-06-19
  */
 @Mapper
 public interface IIncrementTypeMapper extends BaseMapper<IncrementType> {

src/main/java/com/fdkankan/ucenter/service/IIncrementTypeService.java

@@ -11,9 +11,8 @@ import java.util.List;
  * </p>
  *
  * @author 
- * @since 2022-08-01
+ * @since 2023-06-19
  */
 public interface IIncrementTypeService extends IService<IncrementType> {
 
-    List<IncrementType> getByType(String type);
 }

src/main/java/com/fdkankan/ucenter/service/impl/IncrementOrderServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.ucenter.common.PageInfo;
@@ -95,32 +96,32 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
         // 5 专业会员，6 下载 ， 7 高级会员
-        if(param.getDateType() != 5 && param.getDateType() != 6 && param.getDateType() !=7){
+        if(param.getDateType() != 6 && param.getIncrementTypeId() == null){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5012, SceneConstant.FAILURE_MSG_5012);
         }
-        return getGoodsSkuVo(param.getDateType(), param.getUserIncrementId(),param.getMonthQy());
+        return getGoodsSkuVo(param.getDateType(), param.getUserIncrementId(),param.getMonthQy(),param.getIncrementTypeId());
 
     }
 
-    private GoodsSkuVo getGoodsSkuVo (Integer dateType,Integer userIncrementId,Integer monthDy){
+    private GoodsSkuVo getGoodsSkuVo (Integer dateType,Integer userIncrementId,Integer monthDy,Integer incrementTypeId){
         GoodsSkuVo goodsSkuVo = new GoodsSkuVo();
         IncrementType incrementType = null;
-        switch (dateType){
-            case 5 : incrementType = incrementTypeService.list().get(0);
-                goodsSkuVo.setPrice(incrementType.getPrice());
-                goodsSkuVo.setSkuSn(incrementType.getId().toString());
-                goodsSkuVo.setDeadLine(getDateTime(incrementType,userIncrementId,monthDy).toDate().getTime());
-                break;
-            case 6: incrementType = incrementTypeService.list().get(0);
-                goodsSkuVo.setPrice(incrementType.getDownloadPrice());
-                goodsSkuVo.setSkuSn(incrementType.getId().toString());
-                goodsSkuVo.setDeadLine(getDateTime(incrementType,userIncrementId,monthDy).toDate().getTime());
-                break;
-            case 7 : incrementType = incrementTypeService.list().get(1);
-                goodsSkuVo.setPrice(incrementType.getPrice());
-                goodsSkuVo.setSkuSn(incrementType.getId().toString());
-                goodsSkuVo.setDeadLine(getDateTime(incrementType,userIncrementId,monthDy).toDate().getTime());
-                break;
+        if(incrementTypeId != null){       //购买会员
+            incrementType = incrementTypeService.getById(incrementTypeId);
+            if(incrementType == null){
+                throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+            }
+            goodsSkuVo.setPrice(incrementType.getPrice());
+            goodsSkuVo.setSkuSn(incrementType.getId().toString());
+            goodsSkuVo.setDeadLine(getDateTime(incrementType,userIncrementId,monthDy).toDate().getTime());
+            return goodsSkuVo;
+        }
+        if(dateType == 6){ //下载场景
+            incrementType = incrementTypeService.list().get(0);
+            goodsSkuVo.setPrice(incrementType.getDownloadPrice());
+            goodsSkuVo.setSkuSn(incrementType.getId().toString());
+            goodsSkuVo.setDeadLine(getDateTime(incrementType,userIncrementId,monthDy).toDate().getTime());
+            return goodsSkuVo;
         }
 
         return goodsSkuVo;

src/main/java/com/fdkankan/ucenter/service/impl/IncrementTypeServiceImpl.java

@@ -15,16 +15,9 @@ import java.util.List;
  * </p>
  *
  * @author 
- * @since 2022-08-01
+ * @since 2023-06-19
  */
 @Service
 public class IncrementTypeServiceImpl extends ServiceImpl<IIncrementTypeMapper, IncrementType> implements IIncrementTypeService {
 
-    @Override
-    public List<IncrementType> getByType(String type) {
-        LambdaQueryWrapper<IncrementType> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IncrementType::getType,type);
-        wrapper.orderByAsc(IncrementType::getId);
-        return this.list(wrapper);
-    }
 }

src/main/java/com/fdkankan/ucenter/service/impl/OrderServiceImpl.java

@@ -302,7 +302,7 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
             }
             return incrementOrderService.insertIncrementOrder(user, param,incrementType);
         }
-        IncrementType incrementType = incrementTypeService.getById(param.getIncrementType());
+        IncrementType incrementType = incrementTypeService.getById(param.getIncrementTypeId());
         if(incrementType == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
         }

src/main/java/com/fdkankan/ucenter/vo/request/DownNumParam.java

@@ -19,6 +19,9 @@ public class DownNumParam {
 
     private Integer incrementType ;
 
+    private Integer incrementTypeId ;
+
+
     private Integer timeZoneOff;
 
     public Integer getIncrementType() {

src/main/java/com/fdkankan/ucenter/vo/request/OrderParam.java

@@ -22,4 +22,6 @@ public class OrderParam extends RequestBase {
 
     private Integer monthQy;
 
+    private Integer incrementTypeId;
+
 }

src/main/java/com/fdkankan/ucenter/vo/response/UserVo.java

@@ -28,4 +28,6 @@ public class UserVo {
 
     private String country;
 
+    private String cameraUnit;  //相机单位 GB SP
+
 }