fix 计费单商品

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ApplyAreasServiceImpl.java

@@ -122,7 +122,7 @@ public class ApplyAreasServiceImpl extends ServiceImpl<ApplyAreasMapper, ApplyAr
 
     private boolean checkNameUnique(ApplyAreas entity) {
         ApplyAreas info = getOne(new LambdaQueryWrapper<ApplyAreas>()
-                .eq(ApplyAreas::getAreaName,entity.getAreaName()).eq(false,ApplyAreas::getStatus,-1).last("limit 1"));
+                .eq(ApplyAreas::getAreaName,entity.getAreaName()).ne(ApplyAreas::getStatus,-1).last("limit 1"));
         if (Validator.isNotNull(info)) {
             return true;
         }

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

@@ -21,6 +21,9 @@ public class OrderInputDataAddBo {
     /** $column.columnComment */
     @ApiModelProperty("班级")
     private String gradeJson;
+
+    @ApiModelProperty("班级ID")
+    private Long classId;
     /** 备注 */
     @ApiModelProperty("报考地区")
     private String applyAreasJson;

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

@@ -68,4 +68,6 @@ private static final long serialVersionUID=1L;
     private String company;
     /** 备注 */
     private String remark;
+    /** 班级id */
+    private Long classId;
 }

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

@@ -6,6 +6,8 @@ import com.alibaba.fastjson.JSON;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.bank.domain.QuestionBusiness;
+import com.zhongzheng.modules.goods.domain.Goods;
+import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.order.bo.*;
 import com.zhongzheng.modules.order.domain.Order;
 import com.zhongzheng.modules.order.domain.OrderBusiness;
@@ -43,6 +45,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Autowired
     private IOrderBusinessService iOrderBusinessService;
+    @Autowired
+    private IGoodsService iGoodsService;
+
 
 
     @Autowired
@@ -153,6 +158,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         //生成订单
         Collection<OrderGoods> coll = new HashSet<>();
         for (OrderGoodsAddBo g : goodsList) {
+            //订单商品
+            Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getGoodsId,g.getGoodsId()));
+            if(goods.getGoodsStatus()!=1){
+                throw new CustomException("商品尚未上架");
+            }
             OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
             orderGoods.setOrderSn(out_trade_no);
             if(g.getGoodsInputData()!=null){
@@ -175,6 +185,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             totalPrice = totalPrice.add(g.getGoodsPrice());
             //暂不计算优惠券
             payPrice = payPrice.add(g.getGoodsPrice());
+            //视频商品安排班级
+            if(goods.getGoodsType()==1){
+                if(g.getGoodsInputData().getClassId()!=null){
+
+                }
+            }
         }
         iOrderGoodsService.saveBatch(coll);
 

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

@@ -110,4 +110,8 @@ public class OrderGoodsVo {
 	private String createBy;
 	@ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
 	private String goodsType;
+	/** 班级id */
+	@Excel(name = "班级id")
+	@ApiModelProperty("班级id")
+	private Long classId;
 }

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

@@ -82,4 +82,5 @@ public class OrderVo {
 	@ApiModelProperty("订单来源 1业务员录单")
 	private Integer orderFrom;
 
+
 }

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

@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="address" column="address"/>
         <result property="company" column="company"/>
         <result property="remark" column="remark"/>
+        <result property="classId" column="class_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsVo" id="OrderGoodsResultVo">
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessName" column="business_name"/>
         <result property="createBy" column="create_by"/>
         <result property="goodsType" column="goods_type"/>
+        <result property="classId" column="class_id"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">