guoyuji
2024-07-05 4098ea2b95d6da283ac62f2ebb30ce37fe0d6d3f
north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java
@@ -46,6 +46,7 @@
    public boolean saveOrder(Map<String,Object> orderMap) throws Exception {
        JSONObject orderJson = new JSONObject(orderMap);
        String orderIdType = orderJson.getString("orderIdType");
        Order order = JSONObject.parseObject(JSONObject.toJSONString(orderJson.get("title")), Order.class);
        List<OrderDetail> OrderDetails = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("detail")), OrderDetail.class);
        List<OrderOtherMoney> orderOtherMoneyList = JSONArray.parseArray(JSONObject.toJSONString(orderJson.get("otherMoney")), OrderOtherMoney.class);
@@ -56,7 +57,7 @@
        //判断传入id参数是否为空,未传入id为空插入订单表,传入更新表
        try{
            if(order.getOrderId() == null || order.getOrderId().isEmpty()){
                insertOrder(order,OrderDetails,orderOtherMoneyList);
                insertOrder(order,OrderDetails,orderOtherMoneyList,orderIdType);
            }else {
                updateOrder(order,OrderDetails,orderOtherMoneyList);
            }
@@ -117,9 +118,9 @@
        return map;
    }
    //生成订单数据
    public void insertOrder(Order order,List<OrderDetail> OrderDetails,List<OrderOtherMoney> orderOtherMoneyList) {
        String orderId =  getOrderId("day");
    public void insertOrder(Order order, List<OrderDetail> OrderDetails, List<OrderOtherMoney> orderOtherMoneyList, String orderIdType) {
        //根据传入的当前月份或者当天生成订单id
        String orderId =  getOrderId(orderIdType);
        //往主表插数据
        order.setOrderId(orderId);
        order.setCreateOrder(2);