diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java index 671bfd9..603b305 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -654,9 +654,16 @@ public class OrderServiceImpl implements OrderService { order.setType(1); order.setStatus(status); order.setPayStatus(payStatus); + order.setTicketid(0); + order.setTicketimage(" "); + order.setTicketStatus(1); + order.setChargeChannel(1); //history order.setHistoryBuyCode("-"); order.setHistoryBuyName("-"); + // + order.setCloseStatus(1); + order.setIsClose(0); // 分配设置编号 order.setAccountRatioId(accountRatioSetting.getId()); //如果是付费 @@ -677,7 +684,20 @@ public class OrderServiceImpl implements OrderService { userAccountBill.setBatchcode(batchCode); userAccountBill.setOrderUserId(userId); userAccountBill.setServiceCharge(serviceCharge); + userAccountBill.setServiceName("-"); + userAccountBill.setCenterName("-"); + userAccountBill.setCenterNumber("-"); + userAccountBill.setServiceChargeAllot(new BigDecimal("0.00")); userAccountBill.setThatdayBuyMoney(totalMoney); + userAccountBill.setPreliminaryCapital(new BigDecimal("0.00")); + userAccountBill.setAvailableCapital(new BigDecimal("0.00")); + userAccountBill.setDisburseCapital(new BigDecimal("0.00")); + userAccountBill.setEntrustCost(new BigDecimal("0.00")); + userAccountBill.setThatdaySaleMoney(new BigDecimal("0.00")); + userAccountBill.setServiceChargeAllot(new BigDecimal("0.00")); + userAccountBill.setServiceChargeAllot(new BigDecimal("0.00")); + userAccountBill.setFreezeEarnestMoney(new BigDecimal("0.00")); + userAccountBill.setCreatetime(new Date()); // save user's bill userAccountBillMapper.addUserAccBill(userAccountBill); //调整库存 @@ -703,12 +723,16 @@ public class OrderServiceImpl implements OrderService { oplog.setLogid(goods.getId()); oplog.setMessage(sdf.format(new Date()) + "用户" + buyUserName + "下单," + status_Str + "该委托标的"); operationLogMapper.addLog(oplog); - bretMap.put("batchcode", batchCode); + } else { log.error(goodsIsli + "标的已卖完"); bretMap.put("error", "标的已卖完"); + return bretMap; } } + bretMap.put("batchcode", batchCode); + }else{ + bretMap.put("error","订单创建失败"); } return bretMap; }