訂單新增

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationMapper.java

@@ -51,4 +51,14 @@ public interface ActivityConfigurationMapper extends BaseMapper<ActivityConfigur
      * @return Collection<CourseConfigurationVo> 详细配置
      */
     List<ActivityConfigurationVo> selectlistConfiguration(CourseQueryBo bo);
+
+    /**
+     *
+     * @author change
+     * @date 2021/7/1 16:14
+     * @param goodsId
+     * @param activity
+     * @return int
+     */
+    int selectCountActivity(Long goodsId, Long activity);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityConfigurationService.java

@@ -67,4 +67,6 @@ public interface IActivityConfigurationService extends IService<ActivityConfigur
 	 * @return List<ActivityConfigurationVo>
 	 */
     List<ActivityConfigurationVo> listConfiguration(CourseQueryBo bo);
+
+    int selectCount(Long goodsId, Long activity);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityConfigurationServiceImpl.java

@@ -145,6 +145,11 @@ public class ActivityConfigurationServiceImpl extends ServiceImpl<ActivityConfig
         return activityConfigurations;
     }
 
+    @Override
+    public int selectCount(Long goodsId, Long activity) {
+        return baseMapper.selectCountActivity(goodsId,activity);
+    }
+
     /**
      * 实体类转化成视图对象
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderActivityAddBo.java

@@ -20,7 +20,7 @@ public class OrderActivityAddBo {
 
     /** 订单号 */
     @ApiModelProperty("订单号")
-    private Long orderId;
+    private String orderSn;
     /** 活动ID */
     @ApiModelProperty("活动ID")
     private Long activityId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderActivityEditBo.java

@@ -24,7 +24,7 @@ public class OrderActivityEditBo {
 
     /** 订单号 */
     @ApiModelProperty("订单号")
-    private Long orderId;
+    private String orderSn;
 
     /** 活动ID */
     @ApiModelProperty("活动ID")

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderActivityQueryBo.java

@@ -38,7 +38,7 @@ public class OrderActivityQueryBo extends BaseEntity {
 
 	/** 订单号 */
 	@ApiModelProperty("订单号")
-	private Long orderId;
+	private String orderSn;
 	/** 活动ID */
 	@ApiModelProperty("活动ID")
 	private Long activityId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderActivity.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.order.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 活动订单对象 order_activity
+ * 
+ * @author ruoyi
+ * @date 2021-07-01
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("order_activity")
+public class OrderActivity implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+
+    /** 订单号 */
+    private String orderSn;
+
+    /** 活动ID */
+    private Long activityId;
+
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/CouponMapper.java

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.order.mapper;
 
 import com.zhongzheng.modules.order.domain.Coupon;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import feign.Param;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -11,4 +12,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CouponMapper extends BaseMapper<Coupon> {
 
+
+    /**
+     * 查詢是否課程有活動
+     * @author chang
+     * @date 2021/7/1 15:53
+     * @param goodsId
+     * @param couponId
+     * @return Integer
+     */
+    Integer selectCountCon(@Param("goodsId") Long goodsId,@Param("couponId") Long couponId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderActivityMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.order.mapper;
+
+import com.zhongzheng.modules.order.domain.OrderActivity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 活动订单Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-07-01
+ */
+public interface OrderActivityMapper extends BaseMapper<OrderActivity> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/ICouponService.java

@@ -58,4 +58,12 @@ public interface ICouponService extends IService<Coupon> {
 	 * @return List<CouponVo>
 	 */
 	List<CouponVo> queryIssueListCoupon(CouponQueryBo bo);
+
+	/**
+	 * 查詢課程活動
+	 * @param goodsId 主键集合
+	 * @param couponId 主键集合
+	 * @return Integer
+	 */
+    Integer selectCount(Long goodsId, Long couponId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderActivityService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.order.service;
+
+import com.zhongzheng.modules.order.domain.OrderActivity;
+import com.zhongzheng.modules.order.vo.OrderActivityVo;
+import com.zhongzheng.modules.order.bo.OrderActivityQueryBo;
+import com.zhongzheng.modules.order.bo.OrderActivityAddBo;
+import com.zhongzheng.modules.order.bo.OrderActivityEditBo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 活动订单Service接口
+ *
+ * @author ruoyi
+ * @date 2021-07-01
+ */
+public interface IOrderActivityService extends IService<OrderActivity> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	OrderActivityVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<OrderActivityVo> queryList(OrderActivityQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入活动订单
+	 * @param bo 活动订单新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(OrderActivityAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改活动订单
+	 * @param bo 活动订单编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(OrderActivityEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/CouponServiceImpl.java

@@ -127,4 +127,9 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
         lqw.eq(bo.getCouponType() != null, Coupon::getCouponType, bo.getCouponType());
         return entity2Vo(this.list(lqw));
     }
+
+    @Override
+    public Integer selectCount(Long goodsId, Long couponId) {
+        return baseMapper.selectCountCon(goodsId,couponId);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderActivityServiceImpl.java

@@ -0,0 +1,100 @@
+package com.zhongzheng.modules.order.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.zhongzheng.modules.order.bo.OrderActivityAddBo;
+import com.zhongzheng.modules.order.bo.OrderActivityQueryBo;
+import com.zhongzheng.modules.order.bo.OrderActivityEditBo;
+import com.zhongzheng.modules.order.domain.OrderActivity;
+import com.zhongzheng.modules.order.mapper.OrderActivityMapper;
+import com.zhongzheng.modules.order.vo.OrderActivityVo;
+import com.zhongzheng.modules.order.service.IOrderActivityService;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 活动订单Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-07-01
+ */
+@Service
+public class OrderActivityServiceImpl extends ServiceImpl<OrderActivityMapper, OrderActivity> implements IOrderActivityService {
+
+    @Override
+    public OrderActivityVo queryById(Long id){
+        OrderActivity db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, OrderActivityVo.class);
+    }
+
+    @Override
+    public List<OrderActivityVo> queryList(OrderActivityQueryBo bo) {
+        LambdaQueryWrapper<OrderActivity> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getOrderId() != null, OrderActivity::getOrderId, bo.getOrderId());
+        lqw.eq(bo.getActivityId() != null, OrderActivity::getActivityId, bo.getActivityId());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<OrderActivityVo> entity2Vo(Collection<OrderActivity> collection) {
+        List<OrderActivityVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, OrderActivityVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<OrderActivity> page = (Page<OrderActivity>)collection;
+            Page<OrderActivityVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(OrderActivityAddBo bo) {
+        OrderActivity add = BeanUtil.toBean(bo, OrderActivity.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(OrderActivityEditBo bo) {
+        OrderActivity update = BeanUtil.toBean(bo, OrderActivity.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(OrderActivity entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -1,10 +1,14 @@
 package com.zhongzheng.modules.order.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.activity.domain.ActivityConfiguration;
+import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
+import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
 import com.zhongzheng.modules.bank.service.IQuestionBankService;
 import com.zhongzheng.modules.bank.vo.QuestionBankVo;
 import com.zhongzheng.modules.bank.vo.QuestionVo;
@@ -16,11 +20,9 @@ import com.zhongzheng.modules.exam.vo.ExamNoteVo;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.Coupon;
 import com.zhongzheng.modules.order.domain.Order;
+import com.zhongzheng.modules.order.domain.OrderActivity;
 import com.zhongzheng.modules.order.mapper.OrderMapper;
-import com.zhongzheng.modules.order.service.ICouponService;
-import com.zhongzheng.modules.order.service.IOrderCouponService;
-import com.zhongzheng.modules.order.service.IOrderGoodsService;
-import com.zhongzheng.modules.order.service.IOrderService;
+import com.zhongzheng.modules.order.service.*;
 import com.zhongzheng.modules.order.vo.CouponVo;
 import com.zhongzheng.modules.order.vo.OrderVo;
 import com.zhongzheng.modules.user.domain.OrderPossessUser;
@@ -36,6 +38,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Collection;
@@ -80,6 +83,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private IOrderCouponService iOrderCouponService;
 
+    @Autowired
+    private IActivityConfigurationService activityConfigurationService;
+
+    @Autowired
+    private IOrderActivityService oOrderActivityService;
+
     @Override
     public OrderVo queryById(Long orderId){
         Order db = this.baseMapper.selectById(orderId);
@@ -140,6 +149,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, String> placeOrder(OrderAddBo bo) {
         List<OrderGoodsAddBo> goodsList = bo.getGoodsList();
         if(goodsList.size()<1){
@@ -149,7 +159,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        Map<String, String> result = dealOrder(add,goodsList,bo.getCouponId());
+        Map<String, String> result = dealOrder(add,goodsList,bo.getCouponId(),bo.getActivityId());
 
         return result;
     }
@@ -178,7 +188,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return this.removeByIds(ids);
     }
 
-    private Map<String, String>  dealOrder(Order add,List<OrderGoodsAddBo> goodsList,Long couponId){
+    private Map<String, String>  dealOrder(Order add,List<OrderGoodsAddBo> goodsList,Long couponId,Long activity){
         UserVo userVo = iUserService.queryById(add.getUserId());
         String body = "中正云课堂消费";
         String price = "1";
@@ -223,33 +233,63 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if(!iOrderGoodsService.insertByAddBo(g)){
                 throw new CustomException("商品错误");
             }
-            totalPrice = totalPrice.add(g.getGoodsPrice());
 
-        }
-        if(couponId>0){
-            //使用优惠券
-            Coupon coupon= iCouponService.queryByIdAndUserId(couponId,add.getUserId());
-            if(!Validator.isNotNull(coupon)){
-                throw new CustomException("该优惠券不存在");
-            }
-            if(coupon.getUserStatus()!=0||coupon.getEndTime()<DateUtils.getNowTime()){
-                throw new CustomException("该优惠券无法使用");
-            }
-            if(coupon.getCouponType()==0){
-                //优惠券
-                totalPrice = totalPrice.subtract(coupon.getPrice());
+            //查詢該券是否使用於此課程上
+            if(couponId>0 && g.getGoodsType()==1 && iCouponService.selectCount(g.getGoodsId(),couponId) > 0 ){
+                //使用优惠券
+                Coupon coupon= iCouponService.queryByIdAndUserId(couponId,add.getUserId());
+                if(!Validator.isNotNull(coupon)){
+                    throw new CustomException("该优惠券不存在");
+                }
+                if(coupon.getUserStatus()!=0||coupon.getEndTime()<DateUtils.getNowTime()){
+                    throw new CustomException("该优惠券无法使用");
+                }
+                if(coupon.getCouponType()==0){
+                    //优惠券
+                    g.setGoodsPrice(g.getGoodsPrice().subtract(coupon.getPrice()));
 
+                }
+                if(coupon.getCouponType()==1){
+                    //折扣券
+                    g.setGoodsPrice(g.getGoodsPrice().divide((new BigDecimal(10))).multiply(coupon.getPrice()));
+                }
+                OrderCouponAddBo orderCouponAddBo = new OrderCouponAddBo();
+                orderCouponAddBo.setCouponId(couponId);
+                orderCouponAddBo.setOrderSn(out_trade_no);
+                if(!iOrderCouponService.insertByAddBo(orderCouponAddBo)){
+                    throw new CustomException("优惠券数据错误");
+                }
             }
-            if(coupon.getCouponType()==1){
-                //折扣券
-                totalPrice = totalPrice.divide((new BigDecimal(10))).multiply(coupon.getPrice());
-            }
-            OrderCouponAddBo orderCouponAddBo = new OrderCouponAddBo();
-            orderCouponAddBo.setCouponId(couponId);
-            orderCouponAddBo.setOrderSn(out_trade_no);
-            if(!iOrderCouponService.insertByAddBo(orderCouponAddBo)){
-                throw new CustomException("优惠券数据错误");
+
+            //查詢該活動是否使用於此課程上
+            if(activity >0 && g.getGoodsType()==1 && activityConfigurationService.selectCount(g.getGoodsId(),activity) > 0 ){
+                //使用活動
+                ActivityConfigurationVo activityConfigurationVo = activityConfigurationService.queryById(activity);
+                if(!Validator.isNotNull(activityConfigurationVo)){
+                    throw new CustomException("该活動不存在");
+                }
+                if(Convert.toLong(activityConfigurationVo.getActivityType()) ==3){
+                    //定價
+                    g.setGoodsPrice(activityConfigurationVo.getPrice());
+                }
+                if(Convert.toLong(activityConfigurationVo.getActivityType()) ==4){
+                    //優惠
+                    g.setGoodsPrice(g.getGoodsPrice().subtract((activityConfigurationVo.getPrice())));
+                }
+                if(Convert.toLong(activityConfigurationVo.getActivityType()) ==5){
+                    //折扣
+                    g.setGoodsPrice(g.getGoodsPrice().divide((new BigDecimal(10))).multiply(activityConfigurationVo.getPrice()));
+                }
+                OrderActivityAddBo orderActivityAddBo = new OrderActivityAddBo();
+                orderActivityAddBo.setActivityId(couponId);
+                orderActivityAddBo.setOrderSn(out_trade_no);
+                if(!oOrderActivityService.insertByAddBo(orderActivityAddBo)){
+                    throw new CustomException("活動錯誤");
+                }
             }
+
+            totalPrice = totalPrice.add(g.getGoodsPrice());
+
         }
         BigDecimal zero = new BigDecimal(0.01);
         if(totalPrice.compareTo(zero) == -1){

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderActivityVo.java

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.order.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 活动订单视图对象 mall_package
+ *
+ * @author ruoyi
+ * @date 2021-07-01
+ */
+@Data
+@ApiModel("活动订单视图对象")
+public class OrderActivityVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 订单号 */
+	@Excel(name = "订单号")
+	@ApiModelProperty("订单号")
+	private Long orderId;
+	/** 活动ID */
+	@Excel(name = "活动ID")
+	@ApiModelProperty("活动ID")
+	private Long activityId;
+
+}

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -218,7 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectlistConfiguration" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo" resultMap="ActivityConfigurationResult">
+    <select id="selectCountActivity" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo" resultMap="ActivityConfigurationResult">
         SELECT
         c.id,
         c.activity_name,
@@ -246,4 +246,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         order by c.update_time desc
     </select>
+
+    <select id="selectConfigures" parameterType="java.lang.Long" resultMap="ActivityConfigurationResultVO">
+        SELECT
+            c.*,
+            s.*
+        FROM
+            activity_configuration c
+                LEFT JOIN activity_configuration_course f ON c.id = f.configuration_id
+                LEFT JOIN course s ON f.configuration_id = s.course_id
+        WHERE 1=1
+          and c.id = #{id,jdbcType=INTEGER}
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/order/CouponMapper.xml

@@ -10,10 +10,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endTime" column="end_time"/>
         <result property="userId" column="user_id"/>
         <result property="userStatus" column="user_status"/>
-        <result property="rangeStatus" column="range_status"/>
         <result property="configurationId" column="configuration_id"/>
         <result property="couponType" column="coupon_type"/>
     </resultMap>
 
-
+    <select id="selectCountCon" parameterType="Long" resultType="integer">
+        SELECT
+        COUNT(a.id)
+        FROM
+        activity_configuration a
+        LEFT JOIN activity_configuration_course t ON a.id = t.configuration_id
+        WHERE
+        1 = 1
+        <if test="coupon_id != null and coupon_id != ''" >
+            AND a.id = #{activityId}
+        </if>
+        <if test="goodsId != null and goodsId != ''" >
+            AND t.course_id =#{goodsId}
+        </if>
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/order/OrderActivityMapper.xml

@@ -0,0 +1,16 @@
+<?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.zhongzheng.system.mapper.OrderActivityMapper">
+
+    <resultMap type="com.zhongzheng.modules.order.domain.OrderActivity" id="OrderActivityResult">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="activityId" column="activity_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>