fix

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

@@ -70,4 +70,6 @@ public class OrderHandleAddBo {
     private BigDecimal payPrice;
 
     private List<OrderHandleItemAddBo> userGoodsList;
+
+    private Long overTime;
 }

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

@@ -79,5 +79,5 @@ public class OrderHandleEditBo {
     /** 支付价格(成交价) */
     @ApiModelProperty("支付价格(成交价)")
     private BigDecimal payPrice;
-
+    private Long overTime;
 }

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

@@ -60,5 +60,5 @@ private static final long serialVersionUID=1L;
     private Long payTime;
     /** 支付价格(成交价) */
     private BigDecimal payPrice;
-
+    private Long overTime;
 }

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

@@ -111,6 +111,7 @@ public class OrderHandleServiceImpl extends ServiceImpl<OrderHandleMapper, Order
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
         add.setHandleOrderSn(DateUtils.getTagOrderSn("HD"));
+        add.setOverTime(DateUtils.getNowTime()+7*24*3600);
         if(Validator.isEmpty(add.getInputFrom())){
             add.setInputFrom(1);
         }

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

@@ -942,11 +942,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //成交价
             orderGoods.setGoodsPrice(goods.getStandPrice());
             orderGoods.setGoodsRealPrice(goods.getStandPrice());
-            orderGoods.setGoodsReceived(orderGoods.getGoodsRealPrice());
             orderGoods.setGoodsYear(goods.getYear().toString());
             orderGoods.setCreateTime(DateUtils.getNowTime());
             orderGoods.setUpdateTime(DateUtils.getNowTime());
-            orderGoods.setGoodsReceived(g.getGoodsReceived());
+
             if (ObjectUtils.isNotNull(g.getSubOrderGoodsId())){
                 //补充考试次数订单商品ID
                 orderGoods.setSubOrderGoodsId(g.getSubOrderGoodsId());
@@ -955,9 +954,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //订单标准价格不计算优惠
             totalPrice = totalPrice.add(goods.getStandPrice());
             //实际应收价格
-            payPrice = payPrice.add(g.getGoodsRealPrice());
-            //已收价格
-            receivedPrice = receivedPrice.add(g.getGoodsReceived());
+            payPrice = payPrice.add(orderGoods.getGoodsRealPrice());
+
             boolean orderGoodsRs = iOrderGoodsService.save(orderGoods);
             boolean canRepeatBuy = false;
             validUserBeforeBuy(goods, bo.getUserId());
@@ -1007,10 +1005,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 }
             }
             //商品0元或已收费加入收费商品列表
-            if (g.getGoodsRealPrice().compareTo(BigDecimal.ZERO) == 0) {
+            if (orderGoods.getGoodsRealPrice().compareTo(BigDecimal.ZERO) == 0) {
                 //免费的
                 freeList.add(orderGoods);
-            } else if (g.getGoodsRealPrice().compareTo(BigDecimal.ZERO) > 0 && g.getGoodsReceived().compareTo(BigDecimal.ZERO) > 0) {
+            } else if (orderGoods.getGoodsRealPrice().compareTo(BigDecimal.ZERO) > 0 ) {
                 //有收费的
                 payList.add(orderGoods);
             }
@@ -1043,29 +1041,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             }
             add.setStatus(1);
         }
-        if (bo.getOrderFrom() != 6){
-            orderCostHandle(add,1);
-        }
+        add.setOrgSign(1);
         this.save(add);
-        //处理收费商品,生成计费单
-        Map<String, Object> billRs = null;
-        if (payList.size() > 0) {
-            OrderBillSheetAddBo billSheetAddBo = new OrderBillSheetAddBo();
-            billSheetAddBo.setInputOrderSn(bo.getInputOrderSn());
-            List<OrderBillGoodsAddBo> billGoodsList = new ArrayList<>();
-            for (OrderGoods orderGoods : payList) {
-                OrderBillGoodsAddBo billGoodsAddBo = new OrderBillGoodsAddBo();
-                billGoodsAddBo.setOrderSn(add.getOrderSn());
-                billGoodsAddBo.setGoodsId(orderGoods.getGoodsId());
-                billGoodsAddBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
-                billGoodsAddBo.setAmount(orderGoods.getGoodsReceived());
-                billGoodsList.add(billGoodsAddBo);
-//                //商品是否有活动模考
-//                iUserMockSubscribeService.addActivityMock(orderGoods.getGoodsId(),add.getUserId());
-            }
-            billSheetAddBo.setGoodsList(billGoodsList);
-            billRs = iOrderBillSheetService.placeBillInputOrder(billSheetAddBo);
-        }
+
 
         //处理免费商品
         for (OrderGoods orderGoods : freeList) {
@@ -1077,10 +1055,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         result.put("orderSn", out_trade_no);
         result.put("sheetId", null);
         result.put("sheetSn", null);
-        if (Validator.isNotEmpty(billRs)) {
-            result.put("sheetId", billRs.get("sheetId"));
-            result.put("sheetSn", billRs.get("sheetSn"));
-        }
         return result;
     }
 

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

@@ -100,4 +100,6 @@ public class OrderHandleVo {
 	@ApiModelProperty("已退费金额")
 	private BigDecimal goodsRefund;
 
+	private Long overTime;
+
 }