开发环境部署

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

@@ -2,8 +2,10 @@ package com.fdkankan.ucenter.controller;
 
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.IIncrementTypeService;
 import com.fdkankan.ucenter.service.IUserIncrementService;
 import com.fdkankan.ucenter.vo.request.IncrementParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -13,6 +15,16 @@ public class IncrementController {
 
     @Autowired
     IUserIncrementService userIncrementService;
+    @Autowired
+    IIncrementTypeService incrementTypeService;
+
+    @GetMapping("/getIncrementType")
+    public Result getIncrementType(@RequestParam (required = false) String type){
+        if(StringUtils.isEmpty(type)){
+            type = "cn";
+        }
+        return Result.success(incrementTypeService.getByType(type));
+    }
 
     @PostMapping("/findIncrementList")
     public Result findIncrementList(@RequestBody IncrementParam param, @RequestHeader String token){

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

@@ -39,6 +39,7 @@ public class OrderController {
         orderService.cancel(param.getOrderId());
         return Result.success();
     }
+
     /**
      * 确认收货
      */
@@ -47,6 +48,7 @@ public class OrderController {
         orderService.receipt(param.getOrderId());
         return Result.success();
     }
+
     /**
      * 确认订单
      */

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

@@ -114,5 +114,8 @@ public class IncrementOrder implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("increment_type")
+    private Integer incrementType;
+
 
 }

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

@@ -0,0 +1,93 @@
+package com.fdkankan.ucenter.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 会员权益类型
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-01
+ */
+@Getter
+@Setter
+@TableName("t_increment_type")
+public class IncrementType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 权益类型名称
+     */
+    @TableField("name")
+    private String name;
+
+    @TableField("type")
+    private String type;
+
+    /**
+     * 下载次数，-1代表无限次
+     */
+    @TableField("download_num")
+    private Integer downloadNum;
+    /**
+     * 下载次数，-1代表无限次
+     */
+    @TableField("download_price")
+    private BigDecimal downloadPrice;
+
+    /**
+     * 相机容量 单位 G
+     */
+    @TableField("camera_capacity")
+    private Integer cameraCapacity;
+
+    /**
+     * 购买之后，有效期天数，-1代表无限制
+     */
+    @TableField("valid_time")
+    private Integer validTime;
+
+    /**
+     * 0:年;1:月：2：日
+     */
+    @TableField("valid_time_type")
+    private Integer validTimeType;
+
+    /**
+     * 权益价格
+     */
+    @TableField("price")
+    private BigDecimal price;
+
+    /**
+     * 价格符号
+     */
+    @TableField("symbol")
+    private String symbol;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+
+}

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_agent_audit",
+                "t_increment_type",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

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

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.fdkankan.ucenter.entity.IncrementType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 会员权益类型 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-01
+ */
+@Mapper
+public interface IIncrementTypeMapper extends BaseMapper<IncrementType> {
+
+}

src/main/java/com/fdkankan/ucenter/pay/strategy/impl/IncrementOrderImpl.java

@@ -1,9 +1,6 @@
 package com.fdkankan.ucenter.pay.strategy.impl;
 
-import com.fdkankan.ucenter.entity.CameraDetail;
-import com.fdkankan.ucenter.entity.IncrementOrder;
-import com.fdkankan.ucenter.entity.User;
-import com.fdkankan.ucenter.entity.UserIncrement;
+import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.pay.strategy.OrderStrategy;
 import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.util.DateUserUtil;
@@ -13,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
 
 @Log4j2
@@ -28,6 +27,8 @@ public class IncrementOrderImpl implements OrderStrategy {
     ISceneProService sceneProService;
     @Autowired
     ICameraDetailService cameraDetailService;
+    @Autowired
+    IIncrementTypeService incrementTypeService;
 
     @Override
     public void handleOrder(String orderSn, String tradeNo, String openId, int paymentTypeName, Long spaceId) throws Exception {
@@ -42,12 +43,14 @@ public class IncrementOrderImpl implements OrderStrategy {
             log.error("更新增值权益订单失败");
             throw new Exception("更新增值权益订单失败");
         }
-        UserIncrement userIncrementEntity = new UserIncrement();
+        UserIncrement userIncrementEntity = null;
+        IncrementType incrementType = incrementTypeService.getById(responseIncrementOrder.getIncrementType());
+        if(incrementType == null){
+            throw new Exception("更新增值权益订单失败");
+        }
         if(responseIncrementOrder.getIncrementId() == null){
-
             //新的增值权益套餐方案
-            DateTime date = new DateTime().plusYears(1);
-
+            DateTime date = DateUserUtil.getDateTime(new Date(),incrementType);
             if(responseIncrementOrder.getCount() > 0){
                 for(int i = 0, len = responseIncrementOrder.getCount(); i < len; i++){
                     userIncrementEntity = new UserIncrement();
@@ -57,24 +60,13 @@ public class IncrementOrderImpl implements OrderStrategy {
                     userIncrementEntity.setIncrementStartTime(DateUserUtil.getDate(new Date()));
                     userIncrementEntity.setIncrementEndTime(DateUserUtil.getDate(date.toDate()));
                     userIncrementEntity.setIsExpired(0);
+                    userIncrementEntity.setIncrementTypeId(responseIncrementOrder.getIncrementType());
                     userIncrementService.save(userIncrementEntity);
                 }
             }
         }else {
             userIncrementEntity = userIncrementService.getById(responseIncrementOrder.getIncrementId());
-            DateTime date = null;
-            Date nowDate = new Date();
-            if(DateUserUtil.getDate(userIncrementEntity.getIncrementEndTime()).getTime() > nowDate.getTime()){
-                date = new DateTime(userIncrementEntity.getIncrementEndTime()).plusYears(1);
-                if(DateUserUtil.getDate(userIncrementEntity.getIncrementEndTime()).getYear() % 4 == 0){
-                    date.plusDays(1);
-                }
-            }else {
-                date = new DateTime(nowDate).plusYears(1);
-                if(nowDate.getYear() % 4 == 0){
-                    date.plusDays(1);
-                }
-            }
+            DateTime date = DateUserUtil.getDateTime(DateUserUtil.getDate(userIncrementEntity.getIncrementEndTime()),incrementType);
             userIncrementEntity.setIncrementEndTime(DateUserUtil.getDate(date.toDate()));
             userIncrementEntity.setOrderSn(userIncrementEntity.getOrderSn() + "," + orderSn);
             userIncrementEntity.setCreateTime(DateUserUtil.getDate(new Date()));
@@ -88,15 +80,22 @@ public class IncrementOrderImpl implements OrderStrategy {
             }
         }
 
-        User userEntity = userService.getById(userIncrementEntity.getUserId());
-        if(userEntity != null){
-            userEntity.setDownloadNumTotal(userEntity.getDownloadNumTotal() + responseIncrementOrder.getCount() * 10);
-            userService.updateById(userEntity);
+        //增加用户下载次数
+        if(userIncrementEntity != null && userIncrementEntity.getUserId()!=null){
+            User userEntity = userService.getById(userIncrementEntity.getUserId());
+            if(userEntity != null && incrementType.getDownloadNum() >0){
+                userEntity.setDownloadNumTotal(userEntity.getDownloadNumTotal() + responseIncrementOrder.getCount() * incrementType.getDownloadNum());
+                userService.updateById(userEntity);
+            }
         }
     }
 
+
     @Override
     public String getType() {
         return "increment";
     }
+
+
+
 }

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

@@ -3,10 +3,12 @@ package com.fdkankan.ucenter.service;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.ucenter.entity.IncrementOrder;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.ucenter.entity.IncrementType;
 import com.fdkankan.ucenter.vo.request.DownNumParam;
 import com.fdkankan.ucenter.vo.request.IncrementOrderParam;
 import com.fdkankan.ucenter.vo.request.OrderParam;
 import com.fdkankan.ucenter.vo.response.GoodsSkuVo;
+import org.joda.time.DateTime;
 
 import java.math.BigDecimal;
 
@@ -24,9 +26,11 @@ public interface IIncrementOrderService extends IService<IncrementOrder> {
 
     GoodsSkuVo getDownloadPrice(OrderParam param);
 
-    IncrementOrder insertIncrementOrder(Long userId, DownNumParam param, BigDecimal price);
+    IncrementOrder insertIncrementOrder(Long userId, DownNumParam param, IncrementType incrementType);
 
-    IncrementOrder getByOrderSn(String orderSn);
+     DateTime getDateTime(IncrementType incrementType, Integer userIncrementId) ;
+
+     IncrementOrder getByOrderSn(String orderSn);
 
     boolean paySuccessIncrementOrder(String orderSn, String tradeNo, int paymentTypeName);
 }

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

@@ -0,0 +1,19 @@
+package com.fdkankan.ucenter.service;
+
+import com.fdkankan.ucenter.entity.IncrementType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 会员权益类型 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-01
+ */
+public interface IIncrementTypeService extends IService<IncrementType> {
+
+    List<IncrementType> getByType(String type);
+}

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

@@ -5,7 +5,6 @@ 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.SceneConstant;
-import com.fdkankan.common.constant.TbStatus;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.NumberUtils;
@@ -25,6 +24,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -32,6 +32,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import static com.fdkankan.ucenter.util.DateUserUtil.getDateTime;
+
 /**
  * <p>
  * 增值权益订单表 服务实现类
@@ -51,6 +53,10 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
     IUserIncrementService userIncrementService;
     @Autowired
     IGoodsSkuService goodsSkuService;
+    @Autowired
+    IIncrementTypeService incrementTypeService;
+    @Value("${environment}")
+    private String environment;
 
     @Override
     public PageInfo pageList(IncrementOrderParam param) {
@@ -80,23 +86,43 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         if(param.getDateType() == null){
             throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
-
-        if(param.getDateType() != 5 && param.getDateType() != 6){
+        // 5 专业会员，6 下载 ， 7 高级会员
+        if(param.getDateType() != 5 && param.getDateType() != 6 && param.getDateType() !=7){
             throw new BusinessException(SceneConstant.FAILURE_CODE_5012, SceneConstant.FAILURE_MSG_5012);
         }
-        DateTime dateTime = new DateTime();
-        if(param.getUserIncrementId() != null){
-            UserIncrement userIncrementEntity = userIncrementService.getById(param.getUserIncrementId());
-            if(userIncrementEntity != null && DateUserUtil.getDate(userIncrementEntity.getIncrementEndTime()).getTime()> new Date().getTime()){
-                dateTime = new DateTime(DateUserUtil.getDate(userIncrementEntity.getIncrementEndTime()));
-            }
+
+        return getGoodsSkuVo(param.getDateType(),param.getUserIncrementId());
+    }
+
+    private GoodsSkuVo getGoodsSkuVo (Integer dateType,Integer userIncrementId){
+        GoodsSkuVo goodsSkuVo = new GoodsSkuVo();
+        IncrementType incrementType = null;
+        switch (dateType){
+            case 5 : incrementType = incrementTypeService.getByType(environment).get(0);
+                goodsSkuVo.setPrice(incrementType.getPrice());
+                break;
+            case 6: incrementType = incrementTypeService.getByType(environment).get(0);
+                goodsSkuVo.setPrice(incrementType.getDownloadPrice());
+                break;
+            case 7 : incrementType = incrementTypeService.getByType(environment).get(1);
+                goodsSkuVo.setPrice(incrementType.getPrice());
+                break;
+        }
+        goodsSkuVo.setDeadLine(getDateTime(incrementType,userIncrementId).toDate().getTime());
+        return goodsSkuVo;
+    }
+
+    @Override
+    public DateTime getDateTime(IncrementType incrementType, Integer userIncrementId) {
+        Date userTime = new Date();
+        if(userIncrementId != null){
+            UserIncrement userIncrement = userIncrementService.getById(userIncrementId);
+            userTime = DateUserUtil.getDate(userIncrement.getIncrementEndTime());
         }
-        GoodsSkuVo vo = this.getIncrementOrDownloadPrice(param.getDateType());
-        dateTime = dateTime.plusYears(1);
-        vo.setDeadLine(dateTime.toDate().getTime());
-        return vo;
+        return  DateUserUtil.getDateTime(userTime, incrementType);
     }
 
+
     public GoodsSkuVo getIncrementOrDownloadPrice(Integer dateType)  {
         String skuStr = SkuEnum.skusMap.get(String.valueOf(dateType));
         if (StringUtils.isEmpty(skuStr)){
@@ -111,8 +137,9 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
     }
 
     @Override
-    public IncrementOrder insertIncrementOrder(Long userId, DownNumParam param, BigDecimal price) {
-        BigDecimal total = price.multiply(new BigDecimal(param.getCount()));
+    public IncrementOrder insertIncrementOrder(Long userId, DownNumParam param,IncrementType incrementType) {
+
+        BigDecimal total = incrementType.getPrice().multiply(new BigDecimal(param.getCount()));
 
         IncrementOrder incrementOrderEntity = new IncrementOrder();
         incrementOrderEntity.setOrderSn(NumberUtils.getOrderSn());
@@ -127,6 +154,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         incrementOrderEntity.setRecStatus("A");
         incrementOrderEntity.setCreateTime(DateUserUtil.getDate(new Date()));
         incrementOrderEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
+        incrementOrderEntity.setIncrementType(param.getIncrementType());
         this.save(incrementOrderEntity);
         return incrementOrderEntity;
     }

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

@@ -0,0 +1,30 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.ucenter.entity.IncrementType;
+import com.fdkankan.ucenter.mapper.IIncrementTypeMapper;
+import com.fdkankan.ucenter.service.IIncrementTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 会员权益类型 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-08-01
+ */
+@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

@@ -30,6 +30,7 @@ import com.fdkankan.ucenter.vo.response.OrderVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -67,6 +68,10 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
     AlipayService alipayService;
     @Autowired
     IDownloadOrderService downloadOrderService;
+    @Autowired
+    IIncrementTypeService incrementTypeService;
+    @Value("${environment}")
+    private String environment;
 
     @Override
     public PageInfo pageList(OrderParam param) {
@@ -303,15 +308,15 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
         if(param.getAbroad() == 1 && param.getPayType() != 2){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
         }
-        GoodsSku goodsSku = goodsSkuService.getBySku(param.getSkuSn());
-        if(goodsSku == null){
-            throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
-        }
         User user = userService.getByUserName(param.getUserName());
         if(user == null){
             throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
         }
-        return incrementOrderService.insertIncrementOrder(user.getId(), param, param.getAbroad() == 0 ?  goodsSku.getPrice() : goodsSku.getDollarPrice());
+        IncrementType incrementType = incrementTypeService.getById(param.getIncrementType());
+        if(incrementType == null){
+            throw new BusinessException(OrderConstant.FAILURE_CODE_8004, OrderConstant.FAILURE_MSG_8004);
+        }
+        return incrementOrderService.insertIncrementOrder(user.getId(), param,incrementType);
     }
 
     @Override

src/main/java/com/fdkankan/ucenter/util/DateUserUtil.java

@@ -1,5 +1,8 @@
 package com.fdkankan.ucenter.util;
 
+import com.fdkankan.ucenter.entity.IncrementType;
+import org.joda.time.DateTime;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -33,4 +36,17 @@ public class DateUserUtil {
         }
        return time;
     }
+
+    public static DateTime getDateTime(Date userTime,IncrementType incrementType) {
+        DateTime dateTime = new DateTime();
+        if(userTime.getTime() >new Date().getTime()){
+            dateTime = new DateTime(userTime);
+        }
+        switch (incrementType.getValidTimeType()){
+            case 0 : return dateTime.plusYears(incrementType.getValidTime());
+            case 1 : return dateTime.plusMonths(incrementType.getValidTime());
+            case 2 : return dateTime.plusDays(incrementType.getValidTime());
+            default: return dateTime;
+        }
+    }
 }

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

@@ -13,4 +13,5 @@ public class DownNumParam {
     private String userName;
 
     private Long  incrementId;
+    private Integer incrementType;
 }

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

@@ -7,7 +7,7 @@ import lombok.Data;
 public class OrderParam extends RequestBase {
     private String userName;
     private Integer dateType;
-    private Long userIncrementId;
+    private Integer userIncrementId;
 
     private Long orderId;
 

src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,40 @@
+spring:
+  application:
+    name: 4dkankan-center-ucenter
+  cloud:
+    nacos:
+      config:
+        server-addr: 120.24.144.164:8848
+        file-extension: yaml
+        namespace: 4dkankan-v4
+        extension-configs:
+          - data-id: 4dkankan-center-ucenter.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+        shared-configs:
+          - data-id: common-db-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-redis-config-52.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: other-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: common-upload-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
+
+
+

src/main/resources/bootstrap-test.yml

@@ -34,7 +34,7 @@ spring:
 
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
-        namespace: 4dkankan-test
+        namespace: ${spring.cloud.nacos.config.namespace}
 
 
 

src/main/resources/mapper/ucenter/IncrementTypeMapper.xml

@@ -0,0 +1,5 @@
+<?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.fdkankan.ucenter.mapper.IIncrementTypeMapper">
+
+</mapper>