Merge remote-tracking branch 'origin/master' into zhongnanhuang

zhongnanhuang
2 parents 517e96aa 580848c0
Showing 8 changed files with 202 additions and 17 deletions
src/main/java/com/order/erp/common/utils/ProfitUtils.java
src/main/java/com/order/erp/common/utils/SecurityUtils.java
src/main/java/com/order/erp/controller/OrderController.java
src/main/java/com/order/erp/domain/vo/order/OrderUpdateVO.java
src/main/java/com/order/erp/domain/vo/order/ProfitCalculateVO.java
src/main/java/com/order/erp/service/order/OrderBaseInfoService.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
src/main/resources/application-local.yml
+package com.order.erp.common.utils;
+
+import com.order.erp.domain.vo.order.ProfitCalculateVO;
+
+import java.math.BigDecimal;
+
+/**
+ * @author: xms
+ * @description: TODO
+ * @date: 2023/10/23 10:51
+ * @version: 1.0
+ */
+public class ProfitUtils {
+
+    /**
+     * 计算利润率
+     * 1 - (生产科总价/汇率 + 包装费用总价)/客单总价
+     *
+     * @param calculateVO
+     * @return
+     */
+    public static double calculateProfitRate(ProfitCalculateVO calculateVO) {
+        BigDecimal productionDepartmentTotalPrice = new BigDecimal(calculateVO.getProductionDepartmentTotalPrice());
+
+        BigDecimal exchangeRate = new BigDecimal(calculateVO.getExchangeRate());
+
+        BigDecimal packetTotalPrice = new BigDecimal(calculateVO.getPacketTotalPrice());
+
+        BigDecimal customerTotalPrice = new BigDecimal(calculateVO.getCustomerTotalPrice());
+
+        return new BigDecimal(1).subtract((productionDepartmentTotalPrice.divide(exchangeRate).add(packetTotalPrice)).divide(customerTotalPrice)).doubleValue();
+    }
+}
@@ -18,7 +18,7 @@ public class SecurityUtils {
         try {
             userDetails = (UserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         } catch (Exception e) {
-            throw new BusinessException(ServerResultCode.PARAM_ERROR);
+            throw new BusinessException(ServerResultCode.UNAUTHENTICATION);
         }
         return userDetails;
     }
@@ -3,10 +3,7 @@ package com.order.erp.controller;
 import com.order.erp.common.annotation.AnonymousAccess;
 import com.order.erp.common.constant.ServerResult;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
-import com.order.erp.domain.vo.order.OrderAddVO;
-import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
-import com.order.erp.domain.vo.order.OrderBaseInfoVO;
-import com.order.erp.domain.vo.order.OrderUnlockFieldApplyVO;
+import com.order.erp.domain.vo.order.*;
 import com.order.erp.service.order.OrderBaseInfoService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -96,12 +93,12 @@ public class OrderController {
     /**
      * 编辑数据
      *
-     * @param orderBaseInfoVO 数据VO
+     * @param updateVO 数据VO
      * @return 编辑结果
      */
     @PostMapping("/edit")
-    public ServerResult edit(@RequestBody OrderBaseInfoVO orderBaseInfoVO) {
-        return orderBaseInfoService.edit(orderBaseInfoVO);
+    public ServerResult edit(@RequestBody OrderUpdateVO updateVO) {
+        return orderBaseInfoService.edit(updateVO);
     }
     /**
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 订单基础信息表(OrderBaseInfo)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 15:26:43
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class OrderUpdateVO implements Serializable {
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 订单基础信息
+     */
+    private OrderBaseInfoVO baseInfo;
+
+    /**
+     * 利润分析信息
+     */
+    private OrderProfitAnalysisVO profitAnalysisInfo;
+
+    /**
+     * 项目完成报告信息
+     */
+    private OrderCompletionReportVO reportInfo;
+
+    /**
+     * 跟单信息
+     */
+    private OrderTrackStageVO trackStageInfo;
+
+    /**
+     * 质检信息
+     */
+    private OrderInspectionStageVO inspectionStageInfo;
+
+}
+package com.order.erp.domain.vo.order;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.io.Serializable;
+
+/**
+ * 订单利润分析表(OrderProfitAnalysis)实体类
+ *
+ * @author makejava
+ * @since 2023-09-08 15:26:47
+ */
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProfitCalculateVO implements Serializable {
+
+    /**
+     * 客户总价$
+     */
+    private Double customerTotalPrice;
+    /**
+     * 生成科总价￥
+     */
+    private Double productionDepartmentTotalPrice;
+    /**
+     * 包装费用合计￥
+     */
+    private Double packetTotalPrice;
+    /**
+     * 汇率
+     */
+    private Double exchangeRate;
+
+
+}
@@ -67,10 +67,10 @@ public interface OrderBaseInfoService extends IService&lt;OrderBaseInfoDO&gt; {
     /**
      * 修改数据
      *
-     * @param orderBaseInfoVO 数据VO
+     * @param updateVO 数据VO
      * @return 编辑结果
      */
-    ServerResult edit(OrderBaseInfoVO orderBaseInfoVO);
+    ServerResult edit(OrderUpdateVO updateVO);
     /**
      * 通过主键删除数据
@@ -10,13 +10,14 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.constant.Constant;
 import com.order.erp.common.constant.ServerResult;
+import com.order.erp.common.constant.ServerResultCode;
 import com.order.erp.common.excel4j.ExcelUtils;
 import com.order.erp.common.excel4j.exceptions.Excel4JException;
 import com.order.erp.common.exception.BusinessException;
 import com.order.erp.common.utils.OrderFieldUtils;
+import com.order.erp.common.utils.ProfitUtils;
 import com.order.erp.config.DataScope;
 import com.order.erp.domain.ApplyStatusEnum;
 import com.order.erp.domain.ApplyTypeEnum;
@@ -405,6 +406,7 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
                 .eq(StringUtils.isNotBlank(queryVO.getProductStyle()), OrderBaseInfoDO::getProductStyle, queryVO.getProductStyle())
                 .eq(StringUtils.isNotBlank(queryVO.getOutboundType()), OrderBaseInfoDO::getOutboundType, queryVO.getOutboundType())
                 .eq(StringUtils.isNotBlank(queryVO.getPacketType()), OrderBaseInfoDO::getPacketType, queryVO.getPacketType())
+                .orderByDesc(OrderBaseInfoDO::getId)
                 ;
     }
@@ -431,6 +433,11 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
             BeanUtils.copyProperties(profitAnalysisVO, profitAnalysisDO);
             profitAnalysisDO.setOrderId(baseInfoDO.getId());
             profitAnalysisDO.setOrderStatus(OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
+            profitAnalysisDO.setProfitRate(ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
+                    .customerTotalPrice(profitAnalysisDO.getCustomerTotalPrice())
+                    .exchangeRate(profitAnalysisDO.getExchangeRate())
+                    .packetTotalPrice(profitAnalysisDO.getPacketTotalPrice())
+                    .productionDepartmentTotalPrice(profitAnalysisDO.getProductionDepartmentTotalPrice()).build()));
             profitAnalysisService.save(profitAnalysisDO);
         }
@@ -467,18 +474,74 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl&lt;OrderBaseInfoMapper, O
     /**
      * 修改数据
      *
-     * @param orderBaseInfoVO 实例对象
+     * @param updateVO 实例对象
      * @return 实例对象
      */
     @Override
-    public ServerResult edit(OrderBaseInfoVO orderBaseInfoVO) {
+    public ServerResult edit(OrderUpdateVO updateVO) {
         //todo 校验
-        if (Objects.isNull(orderBaseInfoVO.getId())) {
+        if (Objects.isNull(updateVO.getOrderId())) {
             return ServerResult.fail("id 不能为空");
         }
-        OrderBaseInfoDO orderBaseInfoDo = BeanUtil.copyProperties(orderBaseInfoVO, OrderBaseInfoDO.class);
+        if (Objects.nonNull(updateVO.getBaseInfo())) {
+            OrderBaseInfoDO orderBaseInfoDo = BeanUtil.copyProperties(updateVO.getBaseInfo(), OrderBaseInfoDO.class);
+            orderBaseInfoDo.setId(updateVO.getOrderId());
+            updateById(orderBaseInfoDo);
+        }
+        if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
+            OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisService.getOne(new LambdaQueryWrapper<OrderProfitAnalysisDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(OrderProfitAnalysisDO::getOrderId, updateVO.getOrderId()));
+            if (Objects.nonNull(profitAnalysisDO)) {
+                BeanUtils.copyProperties(updateVO.getProfitAnalysisInfo(), profitAnalysisDO);
+                profitAnalysisDO.setOrderId(updateVO.getOrderId());
+                profitAnalysisDO.setOrderStatus(OrderStatusEnum.PROFIT_WAIT_AUDIT.getStatus());
+                profitAnalysisDO.setProfitRate(ProfitUtils.calculateProfitRate(ProfitCalculateVO.builder()
+                        .customerTotalPrice(profitAnalysisDO.getCustomerTotalPrice())
+                        .exchangeRate(profitAnalysisDO.getExchangeRate())
+                        .packetTotalPrice(profitAnalysisDO.getPacketTotalPrice())
+                        .productionDepartmentTotalPrice(profitAnalysisDO.getProductionDepartmentTotalPrice()).build()));
+                profitAnalysisService.updateById(profitAnalysisDO);
+            }
+        }
+
+        if (Objects.nonNull(updateVO.getReportInfo())) {
+            OrderCompletionReportDO reportDO = reportService.getOne(new LambdaQueryWrapper<OrderCompletionReportDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(OrderCompletionReportDO::getOrderId, updateVO.getOrderId()));
+            if (Objects.nonNull(reportDO)) {
+                BeanUtils.copyProperties(updateVO.getReportInfo(), reportDO);
+                reportDO.setOrderId(updateVO.getOrderId());
+                reportDO.setOrderStatus(OrderStatusEnum.REPORT_WAIT_AUDIT.getStatus());
+                reportService.updateById(reportDO);
+            }
+        }
-        updateById(orderBaseInfoDo);
+        if (Objects.nonNull(updateVO.getTrackStageInfo())) {
+            OrderTrackStageDO trackStageDO = trackStageService.getOne(new LambdaQueryWrapper<OrderTrackStageDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(OrderTrackStageDO::getOrderId, updateVO.getOrderId()));
+            if (Objects.nonNull(trackStageDO)) {
+                BeanUtils.copyProperties(updateVO.getTrackStageInfo(), trackStageDO);
+                trackStageDO.setOrderId(updateVO.getOrderId());
+                trackStageDO.setOrderStatus(OrderStatusEnum.TRACK_ING.getStatus());
+                trackStageService.updateById(trackStageDO);
+            }
+
+        }
+
+        if (Objects.nonNull(updateVO.getInspectionStageInfo())) {
+            OrderInspectionStageDO inspectionStageDO = inspectionStageService.getOne(new LambdaQueryWrapper<OrderInspectionStageDO>()
+                    .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                    .eq(OrderInspectionStageDO::getOrderId, updateVO.getOrderId()));
+            if (Objects.nonNull(inspectionStageDO)) {
+                BeanUtils.copyProperties(updateVO.getInspectionStageInfo(), inspectionStageDO);
+                inspectionStageDO.setOrderId(updateVO.getOrderId());
+                inspectionStageDO.setOrderStatus(OrderStatusEnum.INSPECT_ING.getStatus());
+                inspectionStageService.updateById(inspectionStageDO);
+            }
+
+        }
         return ServerResult.success();
     }
@@ -129,7 +129,7 @@ jwt:
   # 必须使用最少88位的Base64对该令牌进行编码
   base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
   # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
-  token-validity-in-seconds: 7200000
+  token-validity-in-seconds: 720000000
   # 在线用户key
   online-key: online-token
   # 验证码