补考订单

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

@@ -56,8 +56,8 @@ public class OrderAddBo {
     /** 订单完成时间 */
     @ApiModelProperty("订单完成时间")
     private Long finishTime;
-    /** 订单类型 1充值订单 2金币消费订单 */
-    @ApiModelProperty("订单类型 1充值订单 2金币消费订单")
+    /** 订单类型   1充值订单 2商品普通订单 */
+    @ApiModelProperty("订单类型   1充值订单 2商品普通订单")
     private Integer orderType;
     /** 支付价格 */
     @ApiModelProperty("支付价格")

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

@@ -67,8 +67,8 @@ public class OrderEditBo {
     @ApiModelProperty("订单完成时间")
     private Long finishTime;
 
-    /** 订单类型 1充值订单 2金币消费订单 */
-    @ApiModelProperty("订单类型 1充值订单 2金币消费订单")
+    /** 订单类型   1充值订单 2商品普通订单 */
+    @ApiModelProperty("订单类型   1充值订单 2商品普通订单")
     private Integer orderType;
 
     /** 支付价格 */

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

@@ -25,7 +25,7 @@ private static final long serialVersionUID=1L;
 
     public static final Integer RECHARGE_ORDER =1;  //充值订单
     public static final Integer CONSUME_ORDER = 2;  //消费订单
-    public static final Integer MAKEUP_ORDER = 3;  //补考订单
+
 
     public static final Integer PAY_NO =0;  //0未收费
     public static final Integer PAY_PART =1;  //1部分收费

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

@@ -54,7 +54,6 @@ public interface IOrderService extends IService<Order> {
 
 	Map<String, String> resumeSmallOrder(OrderAddBo bo);
 
-	Map<String, String> placeSmallMakeUpOrder(OrderAddBo bo);
 
 	/**
 	 * 根据编辑业务对象修改订单

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

@@ -275,7 +275,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        add.setOrderType(Order.CONSUME_ORDER);
+
 
         //生成订单号
         String out_trade_no = DateUtils.getDateOrderSn();
@@ -375,66 +375,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return payResult;
     }
 
-    @Override
-    public Map<String, String> placeSmallMakeUpOrder(OrderAddBo bo) {
-        List<OrderGoodsAddBo> goodsList = bo.getGoodsList();
-        if(goodsList==null||goodsList.size()<1){
-            throw new CustomException("商品列表为空");
-        }
-        Order add = BeanUtil.toBean(bo, Order.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        add.setOrderType(Order.MAKEUP_ORDER);  //补考订单
-
-        //生成订单号
-        String out_trade_no = DateUtils.getDateOrderSn();
-        BigDecimal totalPrice = new BigDecimal(0);
-        BigDecimal payPrice = new BigDecimal(0);
-        String body = "中正祥粤云补考-";
-        //生成订单
-        for (OrderGoodsAddBo g : goodsList) {
-            //订单商品
-            Goods goods = iGoodsService.getOne(new LambdaQueryWrapper<Goods>().eq(Goods::getGoodsId,g.getGoodsId()));
-            if(goods.getGoodsStatus()!=1){
-                throw new CustomException("商品尚未上架");
-            }
-            body = "中正祥粤云补考-"+goods.getGoodsName();
-            OrderGoods orderGoods = BeanUtil.toBean(g, OrderGoods.class);
-            orderGoods.setOrderSn(out_trade_no);
-            if(g.getGoodsInputData()!=null){
-                orderGoods.setGoodsInputData(JSON.toJSONString(g.getGoodsInputData()));
-            }
-
-            //成交价
-            orderGoods.setGoodsRealPrice(goods.getStandPrice());
-            orderGoods.setGoodsPrice(goods.getStandPrice());
-            orderGoods.setCreateTime(DateUtils.getNowTime());
-            orderGoods.setUpdateTime(DateUtils.getNowTime());
-            boolean orderGoodsRs = iOrderGoodsService.save(orderGoods);
-            //订单价格不计算优惠
-            totalPrice = totalPrice.add(goods.getStandPrice());
-            //暂不计算优惠券
-            payPrice = payPrice.add(goods.getStandPrice());
-
-            this.checkBuyGoods(g.getGoodsId(),bo.getUserId());
-
-        }
-
-        add.setOrderSn(out_trade_no);
-        add.setOrderFrom(Order.FROM_SMALL);
-        add.setPayPrice(payPrice);
-        add.setOrderPrice(totalPrice);
-        this.save(add);
-        Map<String, Object> result = new HashMap<>();
-        result.put("oderId",add.getOrderId());
-        result.put("orderSn",out_trade_no);
-        UserVo userVo = iUserService.queryById(add.getUserId());
-        String price = "1";
-        Map<String, String> payResult =  iWxPayService.payment(out_trade_no,userVo.getOpenId(),body,price);
-        payResult.put("orderSn",out_trade_no);
-        return payResult;
-    }
 
 
     @Override