维多利亚

hx-common/service-file/src/main/java/com/fjhx/ServiceFileServeApplication.java → hx-common/service-file/src/main/java/com/fjhx/ServiceFileApplication.java

@@ -7,12 +7,12 @@ import org.springframework.cloud.client.SpringCloudApplication;
  * 文件模块启动器
  */
 @SpringCloudApplication
-public class ServiceFileServeApplication {
+public class ServiceFileApplication {
 
     private static final String APP_NAME = "service-file";
 
     public static void main(String[] args) {
-        BladeApplication.run(APP_NAME, ServiceFileServeApplication.class, args);
+        BladeApplication.run(APP_NAME, ServiceFileApplication.class, args);
     }
 
 }

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

@@ -1,17 +1,15 @@
 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>
  * 销售订单
@@ -22,7 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class Order extends BaseEntity {
+public class OrderInfo extends BaseEntity {
 
     /**
      * 订单类型（1线上 2线下 3京东订单）

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

@@ -1,6 +1,6 @@
 package com.fjhx.params.order;
 
-import com.fjhx.entity.order.Order;
+import com.fjhx.entity.order.OrderInfo;
 import com.fjhx.utils.RegionClientUtil;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OrderEx extends Order implements RegionClientUtil.region {
+public class OrderInfoEx extends OrderInfo implements RegionClientUtil.region {
     /**
      * 客户名称
      */

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

@@ -1,7 +1,7 @@
 package com.fjhx.params.order;
 
-import com.fjhx.entity.order.Order;
 import com.fjhx.entity.order.OrderDetails;
+import com.fjhx.entity.order.OrderInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,7 +15,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class OrderVo extends Order {
+public class OrderInfoVo extends OrderInfo {
 
     /**
      * 订单明细

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.OrderEx;
-import com.fjhx.params.order.OrderVo;
-import com.fjhx.service.order.OrderService;
+import com.fjhx.params.order.OrderInfoEx;
+import com.fjhx.params.order.OrderInfoVo;
+import com.fjhx.service.order.OrderInfoService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,29 +24,31 @@ import java.util.Map;
 public class OrderJdController {
 
     @Autowired
-    private OrderService orderService;
+    private OrderInfoService orderInfoService;
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, Object> condition) {
-        Page<OrderEx> result = orderService.getPage(condition);
+        condition.put("type", 3);
+        Page<OrderInfoEx> result = orderInfoService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody OrderVo orderJdVo) {
-        orderService.add(orderJdVo);
+    public R add(@RequestBody OrderInfoVo orderInfoVo) {
+        orderInfoVo.setType(3);
+        orderInfoService.add(orderInfoVo);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody OrderVo orderJdVo) {
-        orderService.edit(orderJdVo);
+    public R edit(@RequestBody OrderInfoVo orderInfoVo) {
+        orderInfoService.edit(orderInfoVo);
         return R.success();
     }
 
     @PostMapping("/excelImport")
     public R excelImport(@RequestParam("file") MultipartFile file) {
-        Long flag = orderService.excelImport(file);
+        Long flag = orderInfoService.excelImport(file);
         return R.data(flag);
     }
 

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

@@ -1,9 +1,9 @@
 package com.fjhx.controller.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.params.order.OrderEx;
-import com.fjhx.params.order.OrderVo;
-import com.fjhx.service.order.OrderService;
+import com.fjhx.params.order.OrderInfoEx;
+import com.fjhx.params.order.OrderInfoVo;
+import com.fjhx.service.order.OrderInfoService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,23 +26,23 @@ import java.util.Map;
 public class OrderSalesController {
 
     @Autowired
-    private OrderService orderService;
+    private OrderInfoService orderInfoService;
 
     @PostMapping("/page")
     public R page(@RequestBody Map<String, Object> condition){
-        Page<OrderEx> result = orderService.getPage(condition);
+        Page<OrderInfoEx> result = orderInfoService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody OrderVo orderVo) {
-        orderService.add(orderVo);
+    public R add(@RequestBody OrderInfoVo orderVo) {
+        orderInfoService.add(orderVo);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody OrderVo orderVo) {
-        orderService.edit(orderVo);
+    public R edit(@RequestBody OrderInfoVo orderVo) {
+        orderInfoService.edit(orderVo);
         return R.success();
     }
 

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

@@ -1,8 +1,8 @@
 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.entity.order.OrderInfo;
+import com.fjhx.params.order.OrderInfoEx;
 import com.fjhx.utils.wrapperUtil.IWrapper;
 import com.github.yulichang.base.MPJBaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,8 +15,8 @@ import org.apache.ibatis.annotations.Param;
  * @author ${author}
  * @since 2022-12-13
  */
-public interface OrderMapper extends MPJBaseMapper<Order> {
+public interface OrderInfoMapper extends MPJBaseMapper<OrderInfo> {
 
-    Page<OrderEx> getPage(@Param("page") Page<Order> page, @Param("ew") IWrapper<Object> wrapper);
+    Page<OrderInfoEx> getPage(@Param("page") Page<OrderInfo> page, @Param("ew") IWrapper<Object> wrapper);
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderInfoMapper.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.OrderInfoMapper">
+
+    <select id="getPage" resultType="com.fjhx.params.order.OrderInfoEx">
+        select oi.id,
+               oi.customer_info_id,
+               oi.type,
+               oi.code,
+               oi.amount_money,
+               oi.order_time,
+               oi.status,
+               oi.country_id,
+               oi.province_id,
+               oi.city_id,
+               oi.detailed_address,
+               oi.contacts,
+               oi.phone,
+               oi.phone_prefix_type,
+               oi.remark,
+               ci.name customerName
+        from order_info oi
+                 left join customer_info ci on oi.customer_info_id = ci.id
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

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

@@ -1,27 +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.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/service/order/OrderService.java → hx-service/victoriatourist/src/main/java/com/fjhx/service/order/OrderInfoService.java

@@ -1,10 +1,10 @@
 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 com.fjhx.entity.order.OrderInfo;
+import com.fjhx.params.order.OrderInfoEx;
+import com.fjhx.params.order.OrderInfoVo;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;
@@ -17,13 +17,13 @@ import java.util.Map;
  * @author ${author}
  * @since 2022-12-13
  */
-public interface OrderService extends BaseService<Order> {
+public interface OrderInfoService extends BaseService<OrderInfo> {
 
-    Page<OrderEx> getPage(Map<String, Object> condition);
+    Page<OrderInfoEx> getPage(Map<String, Object> condition);
 
-    void add(OrderVo orderVo);
+    void add(OrderInfoVo orderVo);
 
-    void edit(OrderVo orderVo);
+    void edit(OrderInfoVo orderVo);
 
     Long excelImport(MultipartFile file);
 

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

@@ -1,5 +1,6 @@
 package com.fjhx.service.order.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,16 +9,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.Order;
 import com.fjhx.entity.order.OrderDetails;
+import com.fjhx.entity.order.OrderInfo;
 import com.fjhx.entity.product.ProductInfo;
-import com.fjhx.mapper.order.OrderMapper;
-import com.fjhx.params.order.OrderEx;
+import com.fjhx.mapper.order.OrderInfoMapper;
+import com.fjhx.params.order.OrderInfoEx;
+import com.fjhx.params.order.OrderInfoVo;
 import com.fjhx.params.order.OrderJdExcelVo;
-import com.fjhx.params.order.OrderVo;
 import com.fjhx.service.excel.ExcelImportLogService;
 import com.fjhx.service.order.OrderDetailsService;
-import com.fjhx.service.order.OrderService;
+import com.fjhx.service.order.OrderInfoService;
 import com.fjhx.service.product.ProductInfoService;
 import com.fjhx.service.system.SystemConfigService;
 import com.fjhx.uitl.code.CodeEnum;
@@ -46,7 +47,7 @@ import java.util.stream.Collectors;
  * @since 2022-12-13
  */
 @Service
-public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
+public class OrderInfoInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo> implements OrderInfoService {
 
     @Autowired
     private OrderDetailsService orderDetailsService;
@@ -61,21 +62,28 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     private SystemConfigService systemConfigService;
 
     @Override
-    public Page<OrderEx> getPage(Map<String, Object> condition) {
+    public Page<OrderInfoEx> getPage(Map<String, Object> condition) {
 
         IWrapper<Object> wrapper = IWrapper.getWrapper(condition)
-                .keyword(new KeywordData("o", Order::getCode), new KeywordData("ci", CustomerInfo::getName))
-                .eq("o", Order::getType)
-                .eq("o", Order::getStatus)
-                .like("o", Order::getCode)
+                .keyword(new KeywordData("oi", OrderInfo::getCode), new KeywordData("ci", CustomerInfo::getName))
+                .func(q -> {
+                    Integer type = Convert.toInt(condition.get("type"));
+                    if (type == null) {
+                        q.in("oi", OrderInfo::getType, 1, 2);
+                    } else {
+                        q.eq("oi", OrderInfo::getType);
+                    }
+                })
+                .eq("oi", OrderInfo::getStatus)
+                .like("oi", OrderInfo::getCode)
                 .like("ci", CustomerInfo::getName, condition.get("customerName"))
-                .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"));
+                .eq("oi", OrderInfo::getCountryId)
+                .eq("oi", OrderInfo::getProvinceId)
+                .eq("oi", OrderInfo::getCityId)
+                .ge("oi", OrderInfo::getAmountMoney, condition.get("minAmountMoney"))
+                .le("oi", OrderInfo::getAmountMoney, condition.get("maxAmountMoney"));
 
-        Page<OrderEx> page = baseMapper.getPage(createPage(condition), wrapper);
+        Page<OrderInfoEx> page = baseMapper.getPage(createPage(condition), wrapper);
 
         // 赋值国省市
         RegionClientUtil.setEntityRegionName(page.getRecords());
@@ -84,14 +92,17 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
-    public void add(OrderVo orderVo) {
+    public void add(OrderInfoVo orderVo) {
         // 订单明细
         List<OrderDetails> orderDetailsList = orderVo.getOrderDetailsList();
         Assert.notEmpty(orderDetailsList, "订单明细不能为空");
 
-        // 获取京东客户id
-        Long customerCustomerId = systemConfigService.getValue(SystemConfigKeyConstant.CUSTOMER_CUSTOMER_ID, Long.class);
-        orderVo.setCustomerInfoId(customerCustomerId);
+        Integer type = orderVo.getType();
+        if (type == 3) {
+            // 获取京东客户id
+            Long customerCustomerId = systemConfigService.getValue(SystemConfigKeyConstant.CUSTOMER_CUSTOMER_ID, Long.class);
+            orderVo.setCustomerInfoId(customerCustomerId);
+        }
 
         // 订单时间
         orderVo.setOrderTime(ObjectUtil.defaultIfNull(orderVo.getOrderTime(), new Date()));
@@ -104,7 +115,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         orderVo.setStatus(1);
 
         synchronized (this) {
-            orderVo.setCode(CodeEnum.ORDER_JD.getCode(orderVo.getCode()));
+            if (type == 3) {
+                orderVo.setCode(CodeEnum.ORDER_JD.getCode(orderVo.getCode()));
+            } else {
+                orderVo.setCode(CodeEnum.ORDER_SALES.getCode(orderVo.getCode()));
+            }
             save(orderVo);
         }
 
@@ -117,7 +132,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
-    public void edit(OrderVo orderVo) {
+    public void edit(OrderInfoVo orderVo) {
         updateById(orderVo);
     }
 
@@ -145,7 +160,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         excelImportLogService.saveLog(flag, ExcelImportBusinessType.JD_ORDER, file);
 
         // 京东订单表
-        Map<String, Order> map = new HashMap<>();
+        Map<String, OrderInfo> map = new HashMap<>();
 
         // 京东订单明细
         List<OrderDetails> orderDetailsList = new ArrayList<>();
@@ -160,31 +175,32 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             BigDecimal quantity = orderJdExcelVo.getQuantity();
 
             Long productId = codeIdMap.get(productCode);
-            Order order = map.get(code);
-            if (order == null) {
-                order = new OrderEx();
+            OrderInfo orderInfo = map.get(code);
+            if (orderInfo == null) {
+                orderInfo = new OrderInfoEx();
 
                 long id = IdWorker.getId();
-                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);
+                orderInfo.setId(id);
+                orderInfo.setType(3);
+                orderInfo.setCustomerInfoId(customerCustomerId);
+                orderInfo.setCode(code);
+                orderInfo.setAmountMoney(price.multiply(quantity));
+                orderInfo.setOrderTime(orderJdExcelVo.getOrderTime());
+                orderInfo.setStatus(1);
+                orderInfo.setCountryId("China");
+                orderInfo.setDetailedAddress(orderJdExcelVo.getDetailedAddress());
+                orderInfo.setContacts(orderJdExcelVo.getContacts());
+                orderInfo.setPhone(orderJdExcelVo.getPhone());
+                orderInfo.setExcelImportId(flag);
+                orderInfo.setCreateUser(AuthUtil.getUserId());
+                orderInfo.setCreateTime(date);
+                map.put(code, orderInfo);
             } else {
-                order.setAmountMoney(order.getAmountMoney().add(price.multiply(quantity)));
+                orderInfo.setAmountMoney(orderInfo.getAmountMoney().add(price.multiply(quantity)));
             }
 
             OrderDetails orderDetails = new OrderDetails();
-            orderDetails.setOrderId(order.getId());
+            orderDetails.setOrderId(orderInfo.getId());
             orderDetails.setProductId(productId);
             orderDetails.setQuantity(quantity);
             orderDetails.setPrice(price);
@@ -207,13 +223,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
      */
     private void verifyOrderNumber(List<OrderJdExcelVo> list) {
         List<String> codeList = list.stream().map(OrderJdExcelVo::getCode).distinct().collect(Collectors.toList());
-        List<String> existCodeList = listObj(Order::getCode, q -> q.in(Order::getCode, codeList));
+        List<String> existCodeList = listObj(OrderInfo::getCode, q -> q.in(OrderInfo::getCode, codeList));
 
         if (existCodeList.size() > 0) {
             StringJoiner joiner = new StringJoiner(",");
             existCodeList.forEach(joiner::add);
-
-            // 保存导入记录
             throw new ServiceException("存在相同的采购单号:" + joiner);
         }
     }

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

@@ -7,7 +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.OrderService;
+import com.fjhx.service.order.OrderInfoService;
 import com.fjhx.service.product.ProductInfoService;
 import com.fjhx.service.product.ProductSpuService;
 import com.fjhx.service.purchase.PurchaseService;
@@ -36,9 +36,9 @@ public enum CodeEnum {
     //客户
     CUSTOMER("C", null, "code", 5, CustomerInfoService.class),
     //销售订单
-    ORDER_SALES("SO", null, "code", 5, OrderService.class),
+    ORDER_SALES("SO", null, "code", 5, OrderInfoService.class),
     // 京东订单
-    ORDER_JD("JD", null, "code", 5, OrderService.class),
+    ORDER_JD("JD", null, "code", 5, OrderInfoService.class),
 
     ;