维多利亚

hx-common/code-generator/src/main/java/com/fjhx/modular/Victoriatourist.java

@@ -12,7 +12,7 @@ public class Victoriatourist {
         CodeGenerator.MODULAR_NAME = "victoriatourist";
 
         // 需要生成的表名称,多表用,隔开
-        CodeGenerator.INCLUDE = "abnormal_details";
+        CodeGenerator.INCLUDE = "order_details";
 
         // mysql连接
         CodeGenerator.MYSQL_URL = "36.134.91.96:17330";

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/order/OrderJd.java → hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/order/Order.java

@@ -1,27 +1,33 @@
 package com.fjhx.entity.order;
 
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * <p>
  * 销售订单
  * </p>
  *
  * @author ${author}
- * @since 2022-12-08
+ * @since 2022-12-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OrderJd extends BaseEntity {
+public class Order extends BaseEntity {
 
+    /**
+     * 订单类型（1线上 2线下 3京东订单）
+     */
+    private Integer type;
 
     /**
      * 客户id

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/order/OrderJdDetails.java → hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/order/OrderDetails.java

@@ -17,17 +17,17 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author ${author}
- * @since 2022-12-08
+ * @since 2022-12-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OrderJdDetails extends BaseEntity {
+public class OrderDetails extends BaseEntity {
 
 
     /**
-     * 京东订单id
+     * 订单id
      */
-    private Long orderJdId;
+    private Long orderId;
 
     /**
      * 产品id

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/order/OrderSales.java

@@ -1,104 +0,0 @@
-package com.fjhx.entity.order;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 销售订单
- * </p>
- *
- * @author ${author}
- * @since 2022-12-02
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class OrderSales extends BaseEntity {
-
-
-    /**
-     * 客户id
-     */
-    private Long customerInfoId;
-
-    /**
-     * 订单类型（1线上 2线下）
-     */
-    private Integer type;
-
-    /**
-     * 编号
-     */
-    private String code;
-
-    /**
-     * 订单金额
-     */
-    private BigDecimal amountMoney;
-
-    /**
-     * 下单时间
-     */
-    private Date orderTime;
-
-    /**
-     * 订单状态
-     */
-    private Integer status;
-
-    /**
-     * 国家
-     */
-    private String countryId;
-
-    /**
-     * 省
-     */
-    private String provinceId;
-
-    /**
-     * 市
-     */
-    private String cityId;
-
-    /**
-     * 详细地址
-     */
-    private String detailedAddress;
-
-    /**
-     * 联系人
-     */
-    private String contacts;
-
-    /**
-     * 联系电话
-     */
-    private Long phone;
-
-    /**
-     * 联系电话前缀类型
-     */
-    private Integer phonePrefixType;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 逻辑删除 0未删除 1已删除
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
-    private Integer delFlag;
-
-
-}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/order/OrderSalesDetails.java

@@ -1,71 +0,0 @@
-package com.fjhx.entity.order;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.fjhx.base.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 销售订单明细表
- * </p>
- *
- * @author ${author}
- * @since 2022-12-02
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class OrderSalesDetails extends BaseEntity {
-
-
-    /**
-     * 销售订单id
-     */
-    private Long orderSalesId;
-
-    /**
-     * 产品id
-     */
-    private Long productId;
-
-    /**
-     * 数量
-     */
-    private BigDecimal quantity;
-
-    /**
-     * 单价
-     */
-    private BigDecimal price;
-
-    /**
-     * 未出库数量
-     */
-    private BigDecimal notIssuedQuantity;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 乐观锁
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @Version
-    private Integer version;
-
-    /**
-     * 逻辑删除 0未删除 1已删除
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
-    private Integer delFlag;
-
-
-}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderSalesDetailsEx.java → hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderDetailsEx.java

@@ -1,24 +1,20 @@
 package com.fjhx.params.order;
 
-import com.fjhx.entity.order.OrderSalesDetails;
+import com.fjhx.entity.order.OrderDetails;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 /**
  * 销售订单明细表
  *
  * @author ${author}
- * @since 2022-12-02
+ * @since 2022-12-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OrderSalesDetailsEx extends OrderSalesDetails {
-
+public class OrderDetailsEx extends OrderDetails {
     private String productName;
     private String productCode;
     private String productSpecs;
     private String productUnit;
-
 }

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderJdDetailsEx.java → hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderDetailsVo.java

@@ -1,6 +1,6 @@
 package com.fjhx.params.order;
 
-import com.fjhx.entity.order.OrderJdDetails;
+import com.fjhx.entity.order.OrderDetails;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode;
  * 销售订单明细表
  *
  * @author ${author}
- * @since 2022-12-08
+ * @since 2022-12-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OrderJdDetailsEx extends OrderJdDetails {
+public class OrderDetailsVo extends OrderDetails {
 
 }

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderJdEx.java → hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderEx.java

@@ -1,6 +1,6 @@
 package com.fjhx.params.order;
 
-import com.fjhx.entity.order.OrderJd;
+import com.fjhx.entity.order.Order;
 import com.fjhx.utils.RegionClientUtil;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,12 +9,11 @@ import lombok.EqualsAndHashCode;
  * 销售订单
  *
  * @author ${author}
- * @since 2022-12-08
+ * @since 2022-12-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OrderJdEx extends OrderJd implements RegionClientUtil.region {
-
+public class OrderEx extends Order implements RegionClientUtil.region {
     /**
      * 客户名称
      */
@@ -25,5 +24,4 @@ public class OrderJdEx extends OrderJd implements RegionClientUtil.region {
     private String provinceName;
 
     private String cityName;
-
 }

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderJdDetailsVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.order;
-
-import com.fjhx.entity.order.OrderJdDetails;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 销售订单明细表
- *
- * @author ${author}
- * @since 2022-12-08
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class OrderJdDetailsVo extends OrderJdDetails {
-
-}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderSalesDetailsVo.java

@@ -1,17 +0,0 @@
-package com.fjhx.params.order;
-
-import com.fjhx.entity.order.OrderSalesDetails;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 销售订单明细表
- *
- * @author ${author}
- * @since 2022-12-02
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class OrderSalesDetailsVo extends OrderSalesDetails {
-
-}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderSalesEx.java

@@ -1,30 +0,0 @@
-package com.fjhx.params.order;
-
-import com.fjhx.entity.order.OrderSales;
-import com.fjhx.utils.RegionClientUtil;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 销售订单
- *
- * @author ${author}
- * @since 2022-12-02
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class OrderSalesEx extends OrderSales implements RegionClientUtil.region {
-
-    /**
-     * 客户名称
-     */
-    private String customerName;
-
-    private String countryName;
-
-    private String provinceName;
-
-    private String cityName;
-
-
-}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderSalesIssueVo.java

@@ -1,37 +0,0 @@
-package com.fjhx.params.order;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@Data
-public class OrderSalesIssueVo {
-
-    /**
-     * 仓库id
-     */
-    private Long warehouseId;
-
-    /**
-     * 出库明细
-     */
-    private List<IssueDetails> issueDetailsList;
-
-
-    @Data
-    public static class IssueDetails {
-
-        /**
-         * 明细id
-         */
-        private Long detailsId;
-
-        /**
-         * 出库数量
-         */
-        private BigDecimal issueQuantity;
-
-    }
-
-}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderSalesVo.java

@@ -1,22 +0,0 @@
-package com.fjhx.params.order;
-
-import com.fjhx.entity.order.OrderSales;
-import com.fjhx.entity.order.OrderSalesDetails;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * 销售订单
- *
- * @author ${author}
- * @since 2022-12-02
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class OrderSalesVo extends OrderSales {
-
-    private List<OrderSalesDetails> orderSalesDetailsList;
-
-}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderJdVo.java → hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/order/OrderVo.java

@@ -1,7 +1,7 @@
 package com.fjhx.params.order;
 
-import com.fjhx.entity.order.OrderJd;
-import com.fjhx.entity.order.OrderJdDetails;
+import com.fjhx.entity.order.Order;
+import com.fjhx.entity.order.OrderDetails;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,15 +11,15 @@ import java.util.List;
  * 销售订单
  *
  * @author ${author}
- * @since 2022-12-08
+ * @since 2022-12-13
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OrderJdVo extends OrderJd {
+public class OrderVo extends Order {
 
     /**
      * 订单明细
      */
-    private List<OrderJdDetails> orderJdDetailsList;
+    private List<OrderDetails> orderDetailsList;
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/controller/order/OrderDetailsController.java

@@ -0,0 +1,37 @@
+package com.fjhx.controller.order;
+
+import com.fjhx.params.order.OrderDetailsEx;
+import com.fjhx.service.order.OrderDetailsService;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 销售订单明细表 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-02
+ */
+@RestController
+@RequestMapping("/orderDetails")
+public class OrderDetailsController {
+
+    @Autowired
+    private OrderDetailsService orderDetailsService;
+
+    @PostMapping("/listByOrderSalesId")
+    public R listByOrderSalesId(@RequestBody Map<String, Object> condition) {
+        List<OrderDetailsEx> result = orderDetailsService.listByOrderSalesId(condition);
+        return R.success(result);
+    }
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/controller/order/OrderJdController.java

@@ -1,9 +1,9 @@
 package com.fjhx.controller.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.params.order.OrderJdEx;
-import com.fjhx.params.order.OrderJdVo;
-import com.fjhx.service.order.OrderJdService;
+import com.fjhx.params.order.OrderEx;
+import com.fjhx.params.order.OrderVo;
+import com.fjhx.service.order.OrderService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,35 +24,29 @@ import java.util.Map;
 public class OrderJdController {
 
     @Autowired
-    private OrderJdService orderJdService;
+    private OrderService orderService;
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, Object> condition) {
-        Page<OrderJdEx> result = orderJdService.getPage(condition);
+        Page<OrderEx> result = orderService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody OrderJdVo orderJdVo) {
-        orderJdService.add(orderJdVo);
+    public R add(@RequestBody OrderVo orderJdVo) {
+        orderService.add(orderJdVo);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody OrderJdVo orderJdVo) {
-        orderJdService.edit(orderJdVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody OrderJdVo orderJdVo) {
-        orderJdService.delete(orderJdVo);
+    public R edit(@RequestBody OrderVo orderJdVo) {
+        orderService.edit(orderJdVo);
         return R.success();
     }
 
     @PostMapping("/excelImport")
     public R excelImport(@RequestParam("file") MultipartFile file) {
-        Long flag = orderJdService.excelImport(file);
+        Long flag = orderService.excelImport(file);
         return R.data(flag);
     }
 

hx-service/victoriatourist/src/main/java/com/fjhx/controller/order/OrderJdDetailsController.java

@@ -1,56 +0,0 @@
-package com.fjhx.controller.order;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
-import com.fjhx.entity.order.OrderJdDetails;
-import com.fjhx.params.order.OrderJdDetailsVo;
-import com.fjhx.service.order.OrderJdDetailsService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * <p>
- * 销售订单明细表 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2022-12-08
- */
-@RestController
-@RequestMapping("/orderJdDetails")
-public class OrderJdDetailsController {
-
-    @Autowired
-    private OrderJdDetailsService orderJdDetailsService;
-
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition){
-        Page<OrderJdDetails> result = orderJdDetailsService.getPage(condition);
-        return R.success(result);
-    }
-
-    @PostMapping("/add")
-    public R add(@RequestBody OrderJdDetailsVo orderJdDetailsVo){
-        orderJdDetailsService.add(orderJdDetailsVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody OrderJdDetailsVo orderJdDetailsVo){
-        orderJdDetailsService.edit(orderJdDetailsVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody OrderJdDetailsVo orderJdDetailsVo){
-        orderJdDetailsService.delete(orderJdDetailsVo);
-        return R.success();
-    }
-
-}
-

hx-service/victoriatourist/src/main/java/com/fjhx/controller/order/OrderSalesController.java

@@ -1,11 +1,10 @@
 package com.fjhx.controller.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.params.order.OrderSalesEx;
+import com.fjhx.params.order.OrderEx;
+import com.fjhx.params.order.OrderVo;
+import com.fjhx.service.order.OrderService;
 import org.springblade.core.tool.api.R;
-import com.fjhx.entity.order.OrderSales;
-import com.fjhx.params.order.OrderSalesVo;
-import com.fjhx.service.order.OrderSalesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -27,31 +26,25 @@ import java.util.Map;
 public class OrderSalesController {
 
     @Autowired
-    private OrderSalesService orderSalesService;
+    private OrderService orderService;
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, Object> condition){
-        Page<OrderSalesEx> result = orderSalesService.getPage(condition);
+        Page<OrderEx> result = orderService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody OrderSalesVo orderSalesVo){
-        orderSalesService.add(orderSalesVo);
+    public R add(@RequestBody OrderVo orderVo) {
+        orderService.add(orderVo);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody OrderSalesVo orderSalesVo){
-        orderSalesService.edit(orderSalesVo);
+    public R edit(@RequestBody OrderVo orderVo) {
+        orderService.edit(orderVo);
         return R.success();
     }
 
-//    @PostMapping("/delete")
-//    public R delete(@RequestBody OrderSalesVo orderSalesVo){
-//        orderSalesService.delete(orderSalesVo);
-//        return R.success();
-//    }
-
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/controller/order/OrderSalesDetailsController.java

@@ -1,72 +0,0 @@
-package com.fjhx.controller.order;
-
-import com.fjhx.params.order.OrderSalesDetailsEx;
-import com.fjhx.params.order.OrderSalesIssueVo;
-import com.fjhx.service.order.OrderSalesDetailsService;
-import org.springblade.core.tool.api.R;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 销售订单明细表 前端控制器
- * </p>
- *
- * @author ${author}
- * @since 2022-12-02
- */
-@RestController
-@RequestMapping("/orderSalesDetails")
-public class OrderSalesDetailsController {
-
-    @Autowired
-    private OrderSalesDetailsService orderSalesDetailsService;
-
-//    @PostMapping("/page")
-//    public R page(@RequestBody Map<String, Object> condition){
-//        Page<OrderSalesDetails> result = orderSalesDetailsService.getPage(condition);
-//        return R.success(result);
-//    }
-//
-//    @PostMapping("/add")
-//    public R add(@RequestBody OrderSalesDetailsVo orderSalesDetailsVo){
-//        orderSalesDetailsService.add(orderSalesDetailsVo);
-//        return R.success();
-//    }
-//
-//    @PostMapping("/edit")
-//    public R edit(@RequestBody OrderSalesDetailsVo orderSalesDetailsVo){
-//        orderSalesDetailsService.edit(orderSalesDetailsVo);
-//        return R.success();
-//    }
-//
-//    @PostMapping("/delete")
-//    public R delete(@RequestBody OrderSalesDetailsVo orderSalesDetailsVo){
-//        orderSalesDetailsService.delete(orderSalesDetailsVo);
-//        return R.success();
-//    }
-
-
-    @PostMapping("/listByOrderSalesId")
-    public R listByOrderSalesId(@RequestBody Map<String, Object> condition) {
-        List<OrderSalesDetailsEx> result = orderSalesDetailsService.listByOrderSalesId(condition);
-        return R.success(result);
-    }
-
-    /**
-     * 出库
-     */
-    @PostMapping("/issue")
-    public R issue(@RequestBody OrderSalesIssueVo orderSalesIssueVo) {
-        orderSalesDetailsService.issue(orderSalesIssueVo);
-        return R.success();
-    }
-
-}
-

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderDetailsMapper.java

@@ -0,0 +1,23 @@
+package com.fjhx.mapper.order;
+
+import com.fjhx.entity.order.OrderDetails;
+import com.fjhx.params.order.OrderDetailsEx;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 销售订单明细表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-13
+ */
+public interface OrderDetailsMapper extends MPJBaseMapper<OrderDetails> {
+
+    List<OrderDetailsEx> listByOrderSalesId(@Param("ew") IWrapper<Object> wrapper);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderSalesDetailsMapper.xml → hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderDetailsMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.mapper.order.OrderSalesDetailsMapper">
+<mapper namespace="com.fjhx.mapper.order.OrderDetailsMapper">
 
-    <select id="listByOrderSalesId" resultType="com.fjhx.params.order.OrderSalesDetailsEx">
+    <select id="listByOrderSalesId" resultType="com.fjhx.params.order.OrderDetailsEx">
         select osd.id,
-               osd.order_sales_id,
+               osd.order_id,
                osd.product_id,
                osd.quantity,
                osd.not_issued_quantity,
@@ -14,9 +14,8 @@
                pi.code  productCode,
                pi.specs productSpecs,
                pi.unit  productUnit
-        from order_sales_details osd
+        from order_details osd
                  left join product_info pi on osd.product_id = pi.id
             ${ew.customSqlSegment}
     </select>
-
 </mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderJdDetailsMapper.java

@@ -1,17 +0,0 @@
-package com.fjhx.mapper.order;
-
-import com.fjhx.entity.order.OrderJdDetails;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.github.yulichang.base.MPJBaseMapper;
-
-/**
- * <p>
- * 销售订单明细表 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-12-08
- */
-public interface OrderJdDetailsMapper extends MPJBaseMapper<OrderJdDetails> {
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderJdDetailsMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.mapper.order.OrderJdDetailsMapper">
-
-</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderJdMapper.java

@@ -1,23 +0,0 @@
-package com.fjhx.mapper.order;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.order.OrderJd;
-import com.fjhx.params.order.OrderJdEx;
-import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 销售订单 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-12-08
- */
-public interface OrderJdMapper extends MPJBaseMapper<OrderJd> {
-
-    Page<OrderJdEx> getPage(@Param("page") Page<OrderJd> page, @Param("ew") IWrapper<Object> wrapper);
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderJdMapper.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.mapper.order.OrderJdMapper">
-
-    <select id="getPage" resultType="com.fjhx.params.order.OrderJdEx">
-        select oj.id,
-               oj.customer_info_id,
-               oj.code,
-               oj.amount_money,
-               oj.order_time,
-               oj.status,
-               oj.country_id,
-               oj.province_id,
-               oj.city_id,
-               oj.detailed_address,
-               oj.contacts,
-               oj.phone,
-               oj.phone_prefix_type,
-               oj.remark,
-               ci.name customerName
-        from order_jd oj
-                 left join customer_info ci on oj.customer_info_id = ci.id
-            ${ew.customSqlSegment}
-    </select>
-
-</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderMapper.java

@@ -0,0 +1,22 @@
+package com.fjhx.mapper.order;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.order.Order;
+import com.fjhx.params.order.OrderEx;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 销售订单 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-13
+ */
+public interface OrderMapper extends MPJBaseMapper<Order> {
+
+    Page<OrderEx> getPage(@Param("page") Page<Order> page, @Param("ew") IWrapper<Object> wrapper);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mapper.order.OrderMapper">
+
+    <select id="getPage" resultType="com.fjhx.params.order.OrderEx">
+        select o.id,
+               o.customer_info_id,
+               o.type,
+               o.code,
+               o.amount_money,
+               o.order_time,
+               o.status,
+               o.country_id,
+               o.province_id,
+               o.city_id,
+               o.detailed_address,
+               o.contacts,
+               o.phone,
+               o.phone_prefix_type,
+               o.remark,
+               ci.name customerName
+        from order o
+                 left join customer_info ci on o.customer_info_id = ci.id
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderSalesDetailsMapper.java

@@ -1,24 +0,0 @@
-package com.fjhx.mapper.order;
-
-import com.fjhx.entity.order.OrderSalesDetails;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.params.order.OrderSalesDetailsEx;
-import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.MPJBaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 销售订单明细表 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-12-02
- */
-public interface OrderSalesDetailsMapper extends MPJBaseMapper<OrderSalesDetails> {
-
-    List<OrderSalesDetailsEx> listByOrderSalesId(@Param("ew") IWrapper<Object> wrapper);
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderSalesMapper.java

@@ -1,23 +0,0 @@
-package com.fjhx.mapper.order;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.order.OrderSales;
-import com.fjhx.params.order.OrderSalesEx;
-import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.github.yulichang.base.mapper.MPJJoinMapper;
-import org.apache.ibatis.annotations.Param;
-
-/**
- * <p>
- * 销售订单 Mapper 接口
- * </p>
- *
- * @author ${author}
- * @since 2022-12-02
- */
-public interface OrderSalesMapper extends MPJJoinMapper<OrderSales> {
-
-    Page<OrderSalesEx> getPage(@Param("page") Page<OrderSales> page, @Param("ew") IWrapper<Object> wrapper);
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderSalesMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.mapper.order.OrderSalesMapper">
-
-    <select id="getPage" resultType="com.fjhx.params.order.OrderSalesEx">
-        select os.id,
-               os.customer_info_id,
-               os.type,
-               os.code,
-               os.amount_money,
-               os.order_time,
-               os.status,
-               os.country_id,
-               os.province_id,
-               os.city_id,
-               os.detailed_address,
-               os.contacts,
-               os.phone,
-               os.phone_prefix_type,
-               os.remark,
-               ci.name customerName
-        from order_sales os
-                 left join customer_info ci on os.customer_info_id = ci.id
-            ${ew.customSqlSegment}
-    </select>
-
-
-</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/OrderDetailsService.java

@@ -0,0 +1,32 @@
+package com.fjhx.service.order;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.order.OrderDetails;
+import com.fjhx.params.order.OrderDetailsEx;
+import com.fjhx.params.order.OrderDetailsVo;
+import com.fjhx.base.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 销售订单明细表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-13
+ */
+public interface OrderDetailsService extends BaseService<OrderDetails> {
+
+    Page<OrderDetails> getPage(Map<String, Object> condition);
+
+    void add(OrderDetailsVo orderDetailsVo);
+
+    void edit(OrderDetailsVo orderDetailsVo);
+
+    void delete(OrderDetailsVo orderDetailsVo);
+
+    List<OrderDetailsEx> listByOrderSalesId(Map<String, Object> condition);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/OrderJdDetailsService.java

@@ -1,28 +0,0 @@
-package com.fjhx.service.order;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.order.OrderJdDetails;
-import com.fjhx.params.order.OrderJdDetailsVo;
-import com.fjhx.base.BaseService;
-
-import java.util.Map;
-
-/**
- * <p>
- * 销售订单明细表 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-12-08
- */
-public interface OrderJdDetailsService extends BaseService<OrderJdDetails> {
-
-    Page<OrderJdDetails> getPage(Map<String, Object> condition);
-
-    void add(OrderJdDetailsVo orderJdDetailsVo);
-
-    void edit(OrderJdDetailsVo orderJdDetailsVo);
-
-    void delete(OrderJdDetailsVo orderJdDetailsVo);
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/OrderJdService.java

@@ -1,32 +0,0 @@
-package com.fjhx.service.order;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.order.OrderJd;
-import com.fjhx.params.order.OrderJdEx;
-import com.fjhx.params.order.OrderJdVo;
-import com.fjhx.base.BaseService;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Map;
-
-/**
- * <p>
- * 销售订单 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-12-08
- */
-public interface OrderJdService extends BaseService<OrderJd> {
-
-    Page<OrderJdEx> getPage(Map<String, Object> condition);
-
-    void add(OrderJdVo orderJdVo);
-
-    void edit(OrderJdVo orderJdVo);
-
-    void delete(OrderJdVo orderJdVo);
-
-    Long excelImport(MultipartFile file);
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/OrderSalesDetailsService.java

@@ -1,38 +0,0 @@
-package com.fjhx.service.order;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.order.OrderSalesDetails;
-import com.fjhx.params.order.OrderSalesDetailsEx;
-import com.fjhx.params.order.OrderSalesDetailsVo;
-import com.fjhx.base.BaseService;
-import com.fjhx.params.order.OrderSalesIssueVo;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 销售订单明细表 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-12-02
- */
-public interface OrderSalesDetailsService extends BaseService<OrderSalesDetails> {
-
-    Page<OrderSalesDetails> getPage(Map<String, Object> condition);
-
-    void add(OrderSalesDetailsVo orderSalesDetailsVo);
-
-    void edit(OrderSalesDetailsVo orderSalesDetailsVo);
-
-    void delete(OrderSalesDetailsVo orderSalesDetailsVo);
-
-    List<OrderSalesDetailsEx> listByOrderSalesId(Map<String, Object> condition);
-
-    /**
-     * 出库
-     */
-    void issue(OrderSalesIssueVo orderSalesDetailsList);
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/OrderSalesService.java

@@ -1,29 +0,0 @@
-package com.fjhx.service.order;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.order.OrderSales;
-import com.fjhx.params.order.OrderSalesEx;
-import com.fjhx.params.order.OrderSalesVo;
-import com.fjhx.base.BaseService;
-
-import java.util.Map;
-
-/**
- * <p>
- * 销售订单 服务类
- * </p>
- *
- * @author ${author}
- * @since 2022-12-02
- */
-public interface OrderSalesService extends BaseService<OrderSales> {
-
-    Page<OrderSalesEx> getPage(Map<String, Object> condition);
-
-    void add(OrderSalesVo orderSalesVo);
-
-    void edit(OrderSalesVo orderSalesVo);
-
-    void delete(OrderSalesVo orderSalesVo);
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/OrderService.java

@@ -0,0 +1,30 @@
+package com.fjhx.service.order;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.order.Order;
+import com.fjhx.params.order.OrderEx;
+import com.fjhx.params.order.OrderVo;
+import com.fjhx.base.BaseService;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 销售订单 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-13
+ */
+public interface OrderService extends BaseService<Order> {
+
+    Page<OrderEx> getPage(Map<String, Object> condition);
+
+    void add(OrderVo orderVo);
+
+    void edit(OrderVo orderVo);
+
+    Long excelImport(MultipartFile file);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderDetailsServiceImpl.java

@@ -0,0 +1,58 @@
+package com.fjhx.service.order.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.order.OrderDetails;
+import com.fjhx.params.order.OrderDetailsEx;
+import com.fjhx.params.order.OrderDetailsVo;
+import com.fjhx.mapper.order.OrderDetailsMapper;
+import com.fjhx.service.order.OrderDetailsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 销售订单明细表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-13
+ */
+@Service
+public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, OrderDetails> implements OrderDetailsService {
+
+    @Override
+    public Page<OrderDetails> getPage(Map<String, Object> condition) {
+
+        IWrapper<OrderDetails> wrapper = IWrapper.getWrapper(condition);
+
+        return page(condition, wrapper);
+    }
+
+    @Override
+    public void add(OrderDetailsVo orderDetailsVo) {
+        save(orderDetailsVo);
+    }
+
+    @Override
+    public void edit(OrderDetailsVo orderDetailsVo) {
+        updateById(orderDetailsVo);
+    }
+
+    @Override
+    public void delete(OrderDetailsVo orderDetailsVo) {
+        removeById(orderDetailsVo.getId());
+    }
+
+    @Override
+    public List<OrderDetailsEx> listByOrderSalesId(Map<String, Object> condition) {
+        IWrapper<Object> wrapper = IWrapper.getWrapper(condition)
+                .eq("od", OrderDetails::getOrderId);
+
+        return baseMapper.listByOrderSalesId(wrapper);
+    }
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderJdDetailsServiceImpl.java

@@ -1,48 +0,0 @@
-package com.fjhx.service.order.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.order.OrderJdDetails;
-import com.fjhx.params.order.OrderJdDetailsVo;
-import com.fjhx.mapper.order.OrderJdDetailsMapper;
-import com.fjhx.service.order.OrderJdDetailsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.utils.wrapperUtil.IWrapper;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-
-/**
- * <p>
- * 销售订单明细表 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-12-08
- */
-@Service
-public class OrderJdDetailsServiceImpl extends ServiceImpl<OrderJdDetailsMapper, OrderJdDetails> implements OrderJdDetailsService {
-
-    @Override
-    public Page<OrderJdDetails> getPage(Map<String, Object> condition) {
-
-        IWrapper<OrderJdDetails> wrapper = IWrapper.getWrapper(condition);
-
-        return page(condition, wrapper);
-    }
-
-    @Override
-    public void add(OrderJdDetailsVo orderJdDetailsVo) {
-        save(orderJdDetailsVo);
-    }
-
-    @Override
-    public void edit(OrderJdDetailsVo orderJdDetailsVo) {
-        updateById(orderJdDetailsVo);
-    }
-
-    @Override
-    public void delete(OrderJdDetailsVo orderJdDetailsVo) {
-        removeById(orderJdDetailsVo.getId());
-    }
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderSalesDetailsServiceImpl.java

@@ -1,73 +0,0 @@
-package com.fjhx.service.order.impl;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.entity.order.OrderSalesDetails;
-import com.fjhx.mapper.order.OrderSalesDetailsMapper;
-import com.fjhx.params.order.OrderSalesDetailsEx;
-import com.fjhx.params.order.OrderSalesDetailsVo;
-import com.fjhx.params.order.OrderSalesIssueVo;
-import com.fjhx.service.order.OrderSalesDetailsService;
-import com.fjhx.utils.wrapperUtil.IWrapper;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 销售订单明细表 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-12-02
- */
-@Service
-public class OrderSalesDetailsServiceImpl extends ServiceImpl<OrderSalesDetailsMapper, OrderSalesDetails> implements OrderSalesDetailsService {
-
-    @Override
-    public Page<OrderSalesDetails> getPage(Map<String, Object> condition) {
-
-        IWrapper<OrderSalesDetails> wrapper = IWrapper.getWrapper(condition);
-
-        return page(condition, wrapper);
-    }
-
-    @Override
-    public void add(OrderSalesDetailsVo orderSalesDetailsVo) {
-        save(orderSalesDetailsVo);
-    }
-
-    @Override
-    public void edit(OrderSalesDetailsVo orderSalesDetailsVo) {
-        updateById(orderSalesDetailsVo);
-    }
-
-    @Override
-    public void delete(OrderSalesDetailsVo orderSalesDetailsVo) {
-        removeById(orderSalesDetailsVo.getId());
-    }
-
-    @Override
-    public List<OrderSalesDetailsEx> listByOrderSalesId(Map<String, Object> condition) {
-        IWrapper<Object> wrapper = IWrapper.getWrapper(condition)
-                .eq("osd", OrderSalesDetails::getOrderSalesId);
-
-        return baseMapper.listByOrderSalesId(wrapper);
-    }
-
-    @Override
-    public void issue(OrderSalesIssueVo orderSalesIssueVo) {
-
-//        // 出库数量大于0的订单明细id和出库数量
-//        Map<Long, BigDecimal> orderSalesDetailsIdList = orderSalesDetailsList.stream()
-//                .filter(item -> item.getIssueQuantity().compareTo(BigDecimal.ZERO) > 0)
-//                .collect(Collectors.toMap(
-//                        OrderSalesDetailsEx::getId,
-//                        OrderSalesDetailsEx::getIssueQuantity
-//                ));
-
-
-    }
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderSalesServiceImpl.java

@@ -1,104 +0,0 @@
-package com.fjhx.service.order.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.entity.customer.CustomerInfo;
-import com.fjhx.entity.order.OrderSales;
-import com.fjhx.entity.order.OrderSalesDetails;
-import com.fjhx.mapper.order.OrderSalesMapper;
-import com.fjhx.params.order.OrderSalesEx;
-import com.fjhx.params.order.OrderSalesVo;
-import com.fjhx.service.order.OrderSalesDetailsService;
-import com.fjhx.service.order.OrderSalesService;
-import com.fjhx.uitl.code.CodeEnum;
-import com.fjhx.utils.Assert;
-import com.fjhx.utils.RegionClientUtil;
-import com.fjhx.utils.wrapperUtil.IWrapper;
-import com.fjhx.utils.wrapperUtil.KeywordData;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 销售订单 服务实现类
- * </p>
- *
- * @author ${author}
- * @since 2022-12-02
- */
-@Service
-public class OrderSalesServiceImpl extends ServiceImpl<OrderSalesMapper, OrderSales> implements OrderSalesService {
-
-    @Autowired
-    private OrderSalesDetailsService orderSalesDetailsService;
-
-    @Override
-    public Page<OrderSalesEx> getPage(Map<String, Object> condition) {
-
-        IWrapper<Object> wrapper = IWrapper.getWrapper(condition)
-                .keyword(new KeywordData("os", OrderSales::getCode), new KeywordData("ci", CustomerInfo::getName))
-                .eq("os", OrderSales::getType)
-                .eq("os", OrderSales::getStatus)
-                .like("os", OrderSales::getCode)
-                .like("ci", CustomerInfo::getName, condition.get("customerName"))
-                .eq("os", OrderSales::getCountryId)
-                .eq("os", OrderSales::getProvinceId)
-                .eq("os", OrderSales::getCityId)
-                .ge("os", OrderSales::getAmountMoney, condition.get("minAmountMoney"))
-                .le("os", OrderSales::getAmountMoney, condition.get("maxAmountMoney"));
-
-        Page<OrderSalesEx> page = baseMapper.getPage(createPage(condition), wrapper);
-
-        // 赋值国省市
-        RegionClientUtil.setEntityRegionName(page.getRecords());
-
-        return page;
-    }
-
-    @Override
-    public void add(OrderSalesVo orderSalesVo) {
-        List<OrderSalesDetails> orderSalesDetailsList = orderSalesVo.getOrderSalesDetailsList();
-        Assert.notEmpty(orderSalesDetailsList, "产品列表不能为空");
-
-        // 订单时间
-        orderSalesVo.setOrderTime(ObjectUtil.defaultIfNull(orderSalesVo.getOrderTime(), new Date()));
-
-        // 统计订单金额
-        BigDecimal amountMoney = orderSalesDetailsList.stream()
-                .map(item -> item.getPrice().multiply(item.getQuantity())).reduce(BigDecimal.ZERO, BigDecimal::add);
-        orderSalesVo.setAmountMoney(amountMoney);
-
-        // 状态
-        orderSalesVo.setStatus(1);
-
-        // 添加订单
-        synchronized (this) {
-            orderSalesVo.setCode(CodeEnum.ORDER_SALES.getCode());
-            save(orderSalesVo);
-        }
-
-        // 添加订单明细
-        for (OrderSalesDetails orderSalesDetails : orderSalesDetailsList) {
-            orderSalesDetails.setOrderSalesId(orderSalesVo.getId());
-            orderSalesDetails.setNotIssuedQuantity(orderSalesDetails.getQuantity());
-        }
-        orderSalesDetailsService.saveBatch(orderSalesDetailsList);
-    }
-
-    @Override
-    public void edit(OrderSalesVo orderSalesVo) {
-        updateById(orderSalesVo);
-    }
-
-    @Override
-    public void delete(OrderSalesVo orderSalesVo) {
-        removeById(orderSalesVo.getId());
-    }
-
-}

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderJdServiceImpl.java → hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderServiceImpl.java

@@ -8,17 +8,16 @@ import com.fjhx.base.BaseEntity;
 import com.fjhx.constants.ExcelImportBusinessType;
 import com.fjhx.constants.SystemConfigKeyConstant;
 import com.fjhx.entity.customer.CustomerInfo;
-import com.fjhx.entity.order.OrderJd;
-import com.fjhx.entity.order.OrderJdDetails;
-import com.fjhx.entity.order.OrderSales;
+import com.fjhx.entity.order.Order;
+import com.fjhx.entity.order.OrderDetails;
 import com.fjhx.entity.product.ProductInfo;
-import com.fjhx.mapper.order.OrderJdMapper;
-import com.fjhx.params.order.OrderJdEx;
+import com.fjhx.mapper.order.OrderMapper;
+import com.fjhx.params.order.OrderEx;
 import com.fjhx.params.order.OrderJdExcelVo;
-import com.fjhx.params.order.OrderJdVo;
+import com.fjhx.params.order.OrderVo;
 import com.fjhx.service.excel.ExcelImportLogService;
-import com.fjhx.service.order.OrderJdDetailsService;
-import com.fjhx.service.order.OrderJdService;
+import com.fjhx.service.order.OrderDetailsService;
+import com.fjhx.service.order.OrderService;
 import com.fjhx.service.product.ProductInfoService;
 import com.fjhx.service.system.SystemConfigService;
 import com.fjhx.uitl.code.CodeEnum;
@@ -44,38 +43,39 @@ import java.util.stream.Collectors;
  * </p>
  *
  * @author ${author}
- * @since 2022-12-08
+ * @since 2022-12-13
  */
 @Service
-public class OrderJdServiceImpl extends ServiceImpl<OrderJdMapper, OrderJd> implements OrderJdService {
+public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
 
     @Autowired
-    private ExcelImportLogService excelImportLogService;
+    private OrderDetailsService orderDetailsService;
 
     @Autowired
-    private ProductInfoService productInfoService;
+    private ExcelImportLogService excelImportLogService;
 
     @Autowired
-    private OrderJdDetailsService orderJdDetailsService;
+    private ProductInfoService productInfoService;
 
     @Autowired
     private SystemConfigService systemConfigService;
 
     @Override
-    public Page<OrderJdEx> getPage(Map<String, Object> condition) {
+    public Page<OrderEx> getPage(Map<String, Object> condition) {
 
         IWrapper<Object> wrapper = IWrapper.getWrapper(condition)
-                .keyword(new KeywordData("oj", OrderSales::getCode), new KeywordData("ci", CustomerInfo::getName))
-                .eq("oj", OrderJd::getStatus)
-                .like("oj", OrderJd::getCode)
+                .keyword(new KeywordData("o", Order::getCode), new KeywordData("ci", CustomerInfo::getName))
+                .eq("o", Order::getType)
+                .eq("o", Order::getStatus)
+                .like("o", Order::getCode)
                 .like("ci", CustomerInfo::getName, condition.get("customerName"))
-                .eq("oj", OrderJd::getCountryId)
-                .eq("oj", OrderJd::getProvinceId)
-                .eq("oj", OrderJd::getCityId)
-                .ge("oj", OrderJd::getAmountMoney, condition.get("minAmountMoney"))
-                .le("oj", OrderJd::getAmountMoney, condition.get("maxAmountMoney"));
+                .eq("o", Order::getCountryId)
+                .eq("o", Order::getProvinceId)
+                .eq("o", Order::getCityId)
+                .ge("o", Order::getAmountMoney, condition.get("minAmountMoney"))
+                .le("o", Order::getAmountMoney, condition.get("maxAmountMoney"));
 
-        Page<OrderJdEx> page = baseMapper.getPage(createPage(condition), wrapper);
+        Page<OrderEx> page = baseMapper.getPage(createPage(condition), wrapper);
 
         // 赋值国省市
         RegionClientUtil.setEntityRegionName(page.getRecords());
@@ -83,47 +83,42 @@ public class OrderJdServiceImpl extends ServiceImpl<OrderJdMapper, OrderJd> impl
         return page;
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
-    public void add(OrderJdVo orderJdVo) {
+    public void add(OrderVo orderVo) {
         // 订单明细
-        List<OrderJdDetails> orderJdDetailsList = orderJdVo.getOrderJdDetailsList();
-        Assert.notEmpty(orderJdDetailsList, "订单明细不能为空");
+        List<OrderDetails> orderDetailsList = orderVo.getOrderDetailsList();
+        Assert.notEmpty(orderDetailsList, "订单明细不能为空");
 
         // 获取京东客户id
         Long customerCustomerId = systemConfigService.getValue(SystemConfigKeyConstant.CUSTOMER_CUSTOMER_ID, Long.class);
-        orderJdVo.setCustomerInfoId(customerCustomerId);
+        orderVo.setCustomerInfoId(customerCustomerId);
 
         // 订单时间
-        orderJdVo.setOrderTime(ObjectUtil.defaultIfNull(orderJdVo.getOrderTime(), new Date()));
+        orderVo.setOrderTime(ObjectUtil.defaultIfNull(orderVo.getOrderTime(), new Date()));
 
         // 统计订单金额
-        BigDecimal amountMoney = orderJdDetailsList.stream()
+        BigDecimal amountMoney = orderDetailsList.stream()
                 .map(item -> item.getPrice().multiply(item.getQuantity())).reduce(BigDecimal.ZERO, BigDecimal::add);
-        orderJdVo.setAmountMoney(amountMoney);
+        orderVo.setAmountMoney(amountMoney);
 
-        orderJdVo.setStatus(1);
+        orderVo.setStatus(1);
 
         synchronized (this) {
-            orderJdVo.setCode(CodeEnum.ORDER_JD.getCode(orderJdVo.getCode()));
-            save(orderJdVo);
+            orderVo.setCode(CodeEnum.ORDER_JD.getCode(orderVo.getCode()));
+            save(orderVo);
         }
+
         // 添加订单明细
-        for (OrderJdDetails orderJdDetails : orderJdDetailsList) {
-            orderJdDetails.setOrderJdId(orderJdVo.getId());
-            orderJdDetails.setNotIssuedQuantity(orderJdDetails.getQuantity());
+        for (OrderDetails orderDetails : orderDetailsList) {
+            orderDetails.setOrderId(orderVo.getId());
+            orderDetails.setNotIssuedQuantity(orderDetails.getQuantity());
         }
-        orderJdDetailsService.saveBatch(orderJdDetailsList);
+        orderDetailsService.saveBatch(orderDetailsList);
     }
 
     @Override
-    public void edit(OrderJdVo orderJdVo) {
-        updateById(orderJdVo);
-    }
-
-    @Override
-    public void delete(OrderJdVo orderJdVo) {
-        removeById(orderJdVo.getId());
+    public void edit(OrderVo orderVo) {
+        updateById(orderVo);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -150,10 +145,10 @@ public class OrderJdServiceImpl extends ServiceImpl<OrderJdMapper, OrderJd> impl
         excelImportLogService.saveLog(flag, ExcelImportBusinessType.JD_ORDER, file);
 
         // 京东订单表
-        Map<String, OrderJd> map = new HashMap<>();
+        Map<String, Order> map = new HashMap<>();
 
         // 京东订单明细
-        List<OrderJdDetails> orderJdDetailsList = new ArrayList<>();
+        List<OrderDetails> orderDetailsList = new ArrayList<>();
 
         Date date = new Date();
 
@@ -165,41 +160,41 @@ public class OrderJdServiceImpl extends ServiceImpl<OrderJdMapper, OrderJd> impl
             BigDecimal quantity = orderJdExcelVo.getQuantity();
 
             Long productId = codeIdMap.get(productCode);
-            OrderJd orderJd = map.get(code);
-            if (orderJd == null) {
-                orderJd = new OrderJdEx();
+            Order order = map.get(code);
+            if (order == null) {
+                order = new OrderEx();
 
                 long id = IdWorker.getId();
-                orderJd.setId(id);
-                orderJd.setCustomerInfoId(customerCustomerId);
-                orderJd.setCode(code);
-                orderJd.setAmountMoney(price.multiply(quantity));
-                orderJd.setOrderTime(orderJdExcelVo.getOrderTime());
-                orderJd.setStatus(1);
-                orderJd.setCountryId("China");
-                orderJd.setDetailedAddress(orderJdExcelVo.getDetailedAddress());
-                orderJd.setContacts(orderJdExcelVo.getContacts());
-                orderJd.setPhone(orderJdExcelVo.getPhone());
-                orderJd.setExcelImportId(flag);
-                orderJd.setCreateUser(AuthUtil.getUserId());
-                orderJd.setCreateTime(date);
-                map.put(code, orderJd);
+                order.setId(id);
+                order.setCustomerInfoId(customerCustomerId);
+                order.setCode(code);
+                order.setAmountMoney(price.multiply(quantity));
+                order.setOrderTime(orderJdExcelVo.getOrderTime());
+                order.setStatus(1);
+                order.setCountryId("China");
+                order.setDetailedAddress(orderJdExcelVo.getDetailedAddress());
+                order.setContacts(orderJdExcelVo.getContacts());
+                order.setPhone(orderJdExcelVo.getPhone());
+                order.setExcelImportId(flag);
+                order.setCreateUser(AuthUtil.getUserId());
+                order.setCreateTime(date);
+                map.put(code, order);
             } else {
-                orderJd.setAmountMoney(orderJd.getAmountMoney().add(price.multiply(quantity)));
+                order.setAmountMoney(order.getAmountMoney().add(price.multiply(quantity)));
             }
 
-            OrderJdDetails orderJdDetails = new OrderJdDetails();
-            orderJdDetails.setOrderJdId(orderJd.getId());
-            orderJdDetails.setProductId(productId);
-            orderJdDetails.setQuantity(quantity);
-            orderJdDetails.setPrice(price);
-            orderJdDetails.setNotIssuedQuantity(quantity);
+            OrderDetails orderDetails = new OrderDetails();
+            orderDetails.setOrderId(order.getId());
+            orderDetails.setProductId(productId);
+            orderDetails.setQuantity(quantity);
+            orderDetails.setPrice(price);
+            orderDetails.setNotIssuedQuantity(quantity);
 
-            orderJdDetailsList.add(orderJdDetails);
+            orderDetailsList.add(orderDetails);
         }
 
         saveBatch(new ArrayList<>(map.values()));
-        orderJdDetailsService.saveBatch(orderJdDetailsList);
+        orderDetailsService.saveBatch(orderDetailsList);
 
         // 保存导入记录
         excelImportLogService.editLog(start, flag, 1);
@@ -212,7 +207,7 @@ public class OrderJdServiceImpl extends ServiceImpl<OrderJdMapper, OrderJd> impl
      */
     private void verifyOrderNumber(List<OrderJdExcelVo> list) {
         List<String> codeList = list.stream().map(OrderJdExcelVo::getCode).distinct().collect(Collectors.toList());
-        List<String> existCodeList = listObj(OrderJd::getCode, q -> q.in(OrderJd::getCode, codeList));
+        List<String> existCodeList = listObj(Order::getCode, q -> q.in(Order::getCode, codeList));
 
         if (existCodeList.size() > 0) {
             StringJoiner joiner = new StringJoiner(",");
@@ -242,9 +237,6 @@ public class OrderJdServiceImpl extends ServiceImpl<OrderJdMapper, OrderJd> impl
                     joiner.add(productCode);
                 }
             }
-
-//            // 保存导入记录
-//            excelImportLogService.editLog(start, flag, 2);
             throw new ServiceException("产品表中未找到对应产品编码:" + joiner);
         }
         return kv;

hx-service/victoriatourist/src/main/java/com/fjhx/uitl/code/CodeEnum.java

@@ -7,8 +7,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.service.apply.ApplyPurchaseService;
 import com.fjhx.service.customer.CustomerInfoService;
-import com.fjhx.service.order.OrderJdService;
-import com.fjhx.service.order.OrderSalesService;
+import com.fjhx.service.order.OrderService;
 import com.fjhx.service.product.ProductInfoService;
 import com.fjhx.service.product.ProductSpuService;
 import com.fjhx.service.purchase.PurchaseService;
@@ -37,9 +36,9 @@ public enum CodeEnum {
     //客户
     CUSTOMER("C", null, "code", 5, CustomerInfoService.class),
     //销售订单
-    ORDER_SALES("SO", null, "code", 5, OrderSalesService.class),
+    ORDER_SALES("SO", null, "code", 5, OrderService.class),
     // 京东订单
-    ORDER_JD("JD", null, "code", 5, OrderJdService.class),
+    ORDER_JD("JD", null, "code", 5, OrderService.class),
 
     ;