yangdamao 1 päivä sitten
vanhempi
commit
0f5899befb

+ 1 - 0
zhichen-system/src/main/java/com/zhichen/modules/activity/service/impl/ActivityRecommendServiceImpl.java

@@ -237,6 +237,7 @@ public class ActivityRecommendServiceImpl extends ServiceImpl<ActivityRecommendM
 //                    item.setSpecTemplateId(relation.getSpecTemplateId());
 //                }
 //            }
+            item.setBeforeSign(goods.getBeforeSign());
             //多规格下的价格区间
             if (ObjectUtils.isNotNull(goods.getSpecTemplateId())){
                 item.setSpecTemplateId(goods.getSpecTemplateId());

+ 2 - 0
zhichen-system/src/main/java/com/zhichen/modules/activity/vo/ActivityRecommendGoodsVo.java

@@ -65,4 +65,6 @@ public class ActivityRecommendGoodsVo {
 
 	@ApiModelProperty("最大价格")
 	private BigDecimal maxPrice;
+	/** 外部考前商品标签:0否1是 */
+	private Integer beforeSign;
 }

+ 3 - 0
zhichen-system/src/main/java/com/zhichen/modules/goods/vo/GoodsVo.java

@@ -427,4 +427,7 @@ public class GoodsVo {
 
 	/** 课时标识:1 显示 0不显示 */
 	private Integer hoursSign;
+
+	@ApiModelProperty("外部考前订单标签:0否1是")
+	private Integer beforeSign;
 }

+ 1 - 0
zhichen-system/src/main/java/com/zhichen/modules/order/service/impl/OrderServiceImpl.java

@@ -1026,6 +1026,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
+            orderGoods.setBeforeSign(goods.getBeforeSign());
             if (g.getGoodsInputData() != null) {
                 orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
             }

+ 1 - 0
zhichen-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -109,6 +109,7 @@
         <result property="mailSign" column="mail_sign"/>
         <result property="classHoursStr" column="classHoursStr"/>
         <result property="hoursSign" column="hours_Sign"/>
+        <result property="beforeSign" column="before_sign"/>
 
         <result property="supplyName" column="supply_name"/>
         <result property="educationName" column="education_name"/>