下单并生成主单

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.math.BigDecimal;
-import java.util.List;
+import java.util.Date;
 
 /**
  * @author clunt
@@ -61,15 +61,22 @@ public class OrderController extends BaseController {
         }
         // 计算商品费用
         BigDecimal totalPay = goodsService.calculate(appOrderRequest.getGoodsList());
-        //TODO 生成主单 and 细单
-        OrderMaster orderMaster = orderMasterService.createMasterOrder(appOrderRequest);
+        // TODO 生成细单
+        OrderMaster orderMaster = new OrderMaster();
+        orderMaster.setCode(orderMasterService.createOrderCode());
+        orderMaster.setOrderType(1);
+        orderMaster.setOrderStatus(0);
+        orderMaster.setCustomerId(appOrderRequest.getCustomerId());
+        orderMaster.setPayStatus(0);
+        orderMaster.setCreateTime(new Date());
+        orderMasterService.insertOrderMaster(orderMaster);
         //TODO 生成细单
 
         //TODO 生成财务主单
 
         //TODO 生成财务细单(含分销等.)
 
-        return AjaxResult.success();
+        return AjaxResult.success(orderMaster);
     }
 
 }

ghy-order/src/main/java/com/ghy/order/service/OrderMasterService.java

@@ -12,6 +12,8 @@ import java.util.List;
  */
 public interface OrderMasterService {
 
+    String createOrderCode();
+
     OrderMaster createMasterOrder(AppOrderRequest appOrderRequest);
 
     /**

ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java

@@ -9,7 +9,10 @@ import com.ghy.order.service.OrderMasterService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * 商品模块实现类
@@ -22,6 +25,16 @@ public class OrderMasterServiceImpl implements OrderMasterService {
     @Resource
     private OrderMasterMapper orderMasterMapper;
 
+    AtomicLong index = new AtomicLong(1L);
+
+    private final static ThreadLocal<SimpleDateFormat> dateFormat = ThreadLocal.withInitial(()->new SimpleDateFormat("yyyyMMddHHmmss"));
+
+    @Override
+    public String createOrderCode() {
+        index.compareAndSet(9999L, 1L);
+        return "om" + dateFormat.get().format(new Date()) + index.getAndIncrement();
+    }
+
     @Override
     public OrderMaster createMasterOrder(AppOrderRequest appOrderRequest) {
         return null;