fix 服务期

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankAddBo.java

@@ -110,4 +110,11 @@ public class GoodsBankAddBo {
     private List<GoodsAttachedAddBo> bankList;
     @ApiModelProperty("试卷试做配置列表")
     private List<GoodsExamConfigAddBo> examConfigList;
+    /** 服务期类型 1年 2月 3日 4区间 */
+    @ApiModelProperty("服务期类型 1年 2月 3日 4区间")
+    private Integer serviceTimeType;
+
+    /** 服务期数值 */
+    @ApiModelProperty("服务期数值")
+    private Long serviceTimeNum;
 }

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

@@ -179,6 +179,9 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
         //生成订单
         Collection<OrderBillGoods> coll = new HashSet<>();
         for (OrderBillGoodsAddBo g : goodsList) {
+            if(Validator.isEmpty(g.getGoodsId())||Validator.isEmpty(g.getOrderSn())||Validator.isEmpty(g.getAmount())){
+                throw new CustomException("参数缺失");
+            }
             //计费单商品
             OrderBillGoods orderGoods = BeanUtil.toBean(g, OrderBillGoods.class);
             orderGoods.setOrderSn(g.getOrderSn());
@@ -255,6 +258,9 @@ public class OrderBillSheetServiceImpl extends ServiceImpl<OrderBillSheetMapper,
         //生成订单
         Collection<OrderBillGoods> coll = new HashSet<>();
         for (OrderBillGoodsAddBo g : goodsList) {
+            if(Validator.isEmpty(g.getGoodsId())||Validator.isEmpty(g.getOrderSn())||Validator.isEmpty(g.getAmount())){
+                throw new CustomException("参数缺失");
+            }
             //计费单商品
             OrderBillGoods orderGoods = BeanUtil.toBean(g, OrderBillGoods.class);
             orderGoods.setOrderSn(g.getOrderSn());

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

@@ -253,8 +253,14 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             add.setType(OrderGoodsRefund.TYPE_INPUT);
             add.setOrderGoodsId(orderGoods.getOrderGoodsId());
             this.save(add);
+            //修改订单商品退款状态
+            OrderGoods orderGoodsUpdate = new OrderGoods();
+            orderGoodsUpdate.setOrderGoodsId(orderGoods.getOrderGoodsId());
+            orderGoodsUpdate.setRefundStatus(1); //退款中
+            orderGoodsUpdate.setUpdateTime(DateUtils.getNowTime());
+            iOrderGoodsService.updateById(orderGoodsUpdate);
         }
-        return null;
+        return true;
     }
 
     public Boolean refundCall(String WxpayRefundId,Long refundId,Long orderGoodsId,Order order,Long goodsType,Long gradeId,Long userId,Long goodsId){