订单

sd-business/src/main/java/com/sd/business/controller/order/OrderController.java

@@ -12,8 +12,6 @@ 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;
-
 /**
  * <p>
  * 订单 前端控制器
@@ -30,14 +28,6 @@ public class OrderController {
     private OrderService orderService;
 
     /**
-     * 订单列表
-     */
-    @PostMapping("/list")
-    public List<OrderInfoVo> list(@RequestBody OrderSelectDto dto) {
-        return orderService.getList(dto);
-    }
-
-    /**
      * 订单分页
      */
     @PostMapping("/page")

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSelectDto.java

@@ -7,11 +7,37 @@ import lombok.Setter;
 /**
  * 订单列表查询入参实体
  *
- * @author 
+ * @author
  * @since 2023-06-30
  */
 @Getter
 @Setter
 public class OrderSelectDto extends BaseSelectDto {
 
+    /**
+     * 事业部名称
+     */
+    private String departmentName;
+
+    /**
+     * 订单号
+     */
+    private String code;
+
+    /**
+     * 万里牛订单号
+     */
+    private String wlnCode;
+
+    /**
+     * 进度 {@link com.sd.business.entity.order.enums.OrderStatusEnum}
+     */
+    private Integer status;
+
+    /**
+     * 结算状态 1未结算 2已对账 3已结算
+     */
+    private Integer settlementStatus;
+
+
 }

sd-business/src/main/java/com/sd/business/entity/order/po/OrderInfo.java

@@ -117,14 +117,9 @@ public class OrderInfo extends BasePo {
     private BigDecimal packagingMaterialCost;
 
     /**
-     * 交期
+     * 税率
      */
-    private Date deliveryTime;
-
-    /**
-     * 下单时间
-     */
-    private Date orderTime;
+    private BigDecimal taxRate;
 
     /**
      * 发货时间

sd-business/src/main/java/com/sd/business/entity/order/vo/OrderInfoVo.java

@@ -4,6 +4,8 @@ import com.sd.business.entity.order.po.OrderInfo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 订单列表查询返回值实体
  *
@@ -14,4 +16,14 @@ import lombok.Setter;
 @Setter
 public class OrderInfoVo extends OrderInfo {
 
+    /**
+     * 事业部
+     */
+    private String departmentName;
+
+    /**
+     * 交期
+     */
+    private Date deliveryTime;
+
 }

sd-business/src/main/java/com/sd/business/mapper/order/OrderMapper.java

@@ -7,8 +7,6 @@ import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.vo.OrderInfoVo;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * <p>
  * 订单 Mapper 接口
@@ -20,11 +18,6 @@ import java.util.List;
 public interface OrderMapper extends BaseMapper<OrderInfo> {
 
     /**
-     * 订单列表
-     */
-    List<OrderInfoVo> getList(@Param("ew") IWrapper<OrderInfo> wrapper);
-
-    /**
      * 订单分页
      */
     Page<OrderInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<OrderInfo> wrapper);

sd-business/src/main/java/com/sd/business/service/order/OrderService.java

@@ -7,8 +7,6 @@ import com.sd.business.entity.order.dto.OrderSelectDto;
 import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.vo.OrderInfoVo;
 
-import java.util.List;
-
 /**
  * <p>
  * 订单 服务类
@@ -20,11 +18,6 @@ import java.util.List;
 public interface OrderService extends BaseService<OrderInfo> {
 
     /**
-     * 订单列表
-     */
-    List<OrderInfoVo> getList(OrderSelectDto dto);
-
-    /**
      * 订单分页
      */
     Page<OrderInfoVo> getPage(OrderSelectDto dto);

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -1,15 +1,20 @@
 package com.sd.business.service.order.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.department.po.Department;
 import com.sd.business.entity.order.dto.OrderInfoDto;
 import com.sd.business.entity.order.dto.OrderSelectDto;
 import com.sd.business.entity.order.po.OrderInfo;
 import com.sd.business.entity.order.vo.OrderInfoVo;
 import com.sd.business.mapper.order.OrderMapper;
+import com.sd.business.service.department.DepartmentService;
 import com.sd.business.service.order.OrderService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -25,26 +30,52 @@ import java.util.List;
 @Service
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implements OrderService {
 
-    @Override
-    public List<OrderInfoVo> getList(OrderSelectDto dto) {
-        IWrapper<OrderInfo> wrapper = getWrapper();
-        wrapper.orderByDesc("o", OrderInfo::getId);
-        List<OrderInfoVo> list = this.baseMapper.getList(wrapper);
-        return list;
-    }
+    @Autowired
+    private DepartmentService departmentService;
 
     @Override
     public Page<OrderInfoVo> getPage(OrderSelectDto dto) {
         IWrapper<OrderInfo> wrapper = getWrapper();
         wrapper.orderByDesc("o", OrderInfo::getId);
+        wrapper.like("d", Department::getName, dto.getDepartmentName());
+        wrapper.like("o", OrderInfo::getCode, dto.getCode());
+        wrapper.like("o", OrderInfo::getWlnCode, dto.getWlnCode());
+        wrapper.eq("o", OrderInfo::getStatus, dto.getStatus());
+        wrapper.eq("o", OrderInfo::getSettlementStatus, dto.getSettlementStatus());
+        wrapper.ge("o", OrderInfo::getWlnCreateTime, dto.getBeginTime());
+        wrapper.le("o", OrderInfo::getWlnCreateTime, dto.getEndTime());
+
         Page<OrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<OrderInfoVo> records = page.getRecords();
+        if (records.size() == 0) {
+            return page;
+        }
+
+        for (OrderInfoVo record : records) {
+            record.setDeliveryTime(DateUtil.offsetDay(record.getCreateTime(), 1));
+        }
+
         return page;
     }
 
     @Override
     public OrderInfoVo detail(Long id) {
-        OrderInfo OrderInfo = this.getById(id);
-        OrderInfoVo result = BeanUtil.toBean(OrderInfo, OrderInfoVo.class);
+        OrderInfo orderInfo = this.getById(id);
+        if (orderInfo == null) {
+            throw new ServiceException("未知订单");
+        }
+        OrderInfoVo result = BeanUtil.toBean(orderInfo, OrderInfoVo.class);
+        result.setDeliveryTime(DateUtil.offsetDay(result.getCreateTime(), 1));
+
+        if (orderInfo.getDepartmentId() == null) {
+            return result;
+        }
+
+        Department department = departmentService.getById(orderInfo.getDepartmentId());
+        if (department != null) {
+            result.setDepartmentName(department.getName());
+        }
+
         return result;
     }
 

sd-business/src/main/resources/mapper/order/OrderMapper.xml

@@ -1,41 +1,6 @@
 <?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.sd.business.mapper.order.OrderMapper">
-    <select id="getList" resultType="com.sd.business.entity.order.vo.OrderInfoVo">
-        select o.id,
-               o.code,
-               o.wln_code,
-               o.express_delivery_code,
-               o.status,
-               o.settlement_status,
-               o.commerce_platform,
-               o.total_amount,
-               o.product_total_amount,
-               o.custom_processing_fee,
-               o.lssue_fee,
-               o.delivery_materials_fee,
-               o.packing_labor,
-               o.packaging_material_cost,
-               o.delivery_time,
-               o.order_time,
-               o.shipping_time,
-               o.consignee,
-               o.consignee_number,
-               o.province,
-               o.city,
-               o.county,
-               o.detailed_address,
-               o.postcode,
-               o.department_id,
-               o.express_delivery_id,
-               o.remark,
-               o.create_user,
-               o.create_time,
-               o.update_user,
-               o.update_time
-        from order_info o
-            ${ew.customSqlSegment}
-    </select>
 
     <select id="getPage" resultType="com.sd.business.entity.order.vo.OrderInfoVo">
         select o.id,
@@ -68,8 +33,10 @@
                o.create_user,
                o.create_time,
                o.update_user,
-               o.update_time
+               o.update_time,
+               d.name departmentName
         from order_info o
+                 left join department d on d.id = o.department_id
             ${ew.customSqlSegment}
     </select>
 

sd-wln/src/main/java/com/sd/wln/scheduled/WlnSyncTask.java

@@ -3,14 +3,13 @@ package com.sd.wln.scheduled;
 import com.sd.wln.service.WlnOrderService;
 import com.sd.wln.service.WlnSkuService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Profile;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 /**
  * 同步万里牛数据（本地环境不执行同步逻辑）
  */
-@Profile({"test", "prod"})
+// @Profile({"test", "prod"})
 @Component
 public class WlnSyncTask {
 

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fjhx.tenant.entity.dict.po.DictCommonData;
 import com.fjhx.tenant.service.dict.DictCommonDataService;
+import com.ruoyi.common.annotation.LogicIgnore;
 import com.sd.business.entity.department.po.Department;
 import com.sd.business.entity.order.enums.OrderStatusEnum;
 import com.sd.business.entity.order.po.OrderInfo;
@@ -25,6 +26,7 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -53,6 +55,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
     @Autowired
     private SkuSpecService skuSpecService;
 
+    @LogicIgnore
     @Override
     public boolean syncOrder() {
 
@@ -231,6 +234,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         orderInfo.setPostcode(wlnOrder.getString("zip"));
         orderInfo.setDepartmentId(department.getId());
         orderInfo.setRemark(wlnOrder.getString("remark"));
+        orderInfo.setTaxRate(new BigDecimal("10.00"));
 
         StringBuilder builder = new StringBuilder();
         // 订单来源平台

sd-wln/src/main/java/com/sd/wln/service/impl/WlnSkuServiceImpl.java

@@ -3,6 +3,7 @@ package com.sd.wln.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.ruoyi.common.annotation.LogicIgnore;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.exception.ServiceException;
 import com.sd.business.entity.sku.po.Sku;
@@ -38,6 +39,7 @@ public class WlnSkuServiceImpl implements WlnSkuService {
     @Autowired
     private SkuSpecService skuSpecService;
 
+    @LogicIgnore
     @Override
     public boolean syncSkuClassify() {
         List<JSONObject> list;
@@ -85,6 +87,7 @@ public class WlnSkuServiceImpl implements WlnSkuService {
         return true;
     }
 
+    @LogicIgnore
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean syncSku() {