fix 订单

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

@@ -238,6 +238,7 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
                     add.setDoNumber(examNumber.getDoNumber());
                     add.setCreateTime(DateUtils.getNowTime());
                     add.setUpdateTime(DateUtils.getNowTime());
+                    add.setOrderGoodsId(g.getOrderGoodsId());
                     userExamGoodsService.save(add);
                     UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
                     userExamGoodsSupplementAddBo.setGoodsId(goodsVo.getGoodsId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsAddBo.java

@@ -43,4 +43,7 @@ public class UserExamGoodsAddBo {
     /** 已消耗前培次数 */
     @ApiModelProperty("已消耗前培次数")
     private Long expendBefore;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserExamGoodsEditBo.java

@@ -50,5 +50,8 @@ public class UserExamGoodsEditBo {
     /** 已消耗前培次数 */
     @ApiModelProperty("已消耗前培次数")
     private Long expendBefore;
+    /** 订单商品ID */
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserExamGoods.java

@@ -44,5 +44,6 @@ private static final long serialVersionUID=1L;
     private Long expendNumber;
     /** 已消耗前培次数 */
     private Long expendBefore;
-
+    /** 订单商品ID */
+    private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserExamGoodsVo.java

@@ -100,4 +100,9 @@ public class UserExamGoodsVo {
 	@Excel(name = "消耗前培次数")
 	@ApiModelProperty("消耗前培次数")
 	private List<UserSubscribeVo> userSubscribeVos;
+
+	/** 订单商品ID */
+	@Excel(name = "订单商品ID")
+	@ApiModelProperty("订单商品ID")
+	private Long orderGoodsId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wx/service/impl/WxPayServiceImpl.java

@@ -354,6 +354,7 @@ public class WxPayServiceImpl  implements IWxPayService {
                     add.setDoNumber(examNumber.getDoNumber());
                     add.setCreateTime(DateUtils.getNowTime());
                     add.setUpdateTime(DateUtils.getNowTime());
+                    add.setOrderGoodsId(g.getOrderGoodsId());
                     userExamGoodsService.save(add);
                     UserExamGoodsSupplementAddBo userExamGoodsSupplementAddBo = new UserExamGoodsSupplementAddBo();
                     userExamGoodsSupplementAddBo.setGoodsId(goodsVo.getGoodsId());

zhongzheng-system/src/main/resources/mapper/modules/user/UserExamGoodsMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsId" column="goods_id"/>
         <result property="examNumber" column="exam_number"/>
         <result property="doNumber" column="do_number"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamGoodsVo" id="UserExamGoodsVo">
@@ -28,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectName" column="project_name"/>
         <result property="businessName" column="business_name"/>
         <result property="educationName" column="education_name"/>
+        <result property="orderGoodsId" column="order_goods_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.user.vo.UserExamGoodsSupplementVo" id="UserExamGoodsSupplementVo">