提交

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/mail/MailController.java

@@ -0,0 +1,27 @@
+package com.fjhx.mail;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/newMail")
+public class MailController {
+
+    private static final String urlPrefixUrl = "http://127.0.0.1:9998/";
+
+    @GetMapping("/{url}/{url2}")
+    public Object get(@RequestParam Map<String, Object> map, @PathVariable(value = "url") String url, @PathVariable(value = "url2") String url2) {
+        String result = HttpUtil.get(urlPrefixUrl + url + "/" + url2, map);
+        return JSON.parseObject(result);
+    }
+
+    @PostMapping("/{url}/{url2}")
+    public Object post(@RequestBody Map<String, Object> map, @PathVariable(value = "url") String url, @PathVariable(value = "url2") String url2) {
+        String result = HttpUtil.post(urlPrefixUrl + url + "/" + url2, JSON.toJSONString(map));
+        return JSON.parseObject(result);
+    }
+
+}

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/product/service/impl/ProductServiceImpl.java

@@ -38,13 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -137,6 +131,7 @@ public class ProductServiceImpl extends BasicsServiceImpl<ProductMapper, Product
 
         //如果有根据客户名称查询，返回的客户id为空则不查询数据库，因为查询是and关系
         String corporateName = (String) condition.get("corporateName");
+
         //客户id
         List<String> customerIdCondition = (List<String>) condition.get("customerIds");
         if (StringUtils.isNotBlank(corporateName) && CollectionUtils.isEmpty(customerIdCondition)) {
@@ -147,6 +142,7 @@ public class ProductServiceImpl extends BasicsServiceImpl<ProductMapper, Product
         if (CollectionUtils.isEmpty(list)) {
             return new ArrayList<>();
         }
+
         //客户id
         List<String> customerIds = list.stream().map(Product::getCustomerId).distinct().collect(Collectors.toList());
         //调用feign查询客户，根据客户id查询客户信息
@@ -168,8 +164,12 @@ public class ProductServiceImpl extends BasicsServiceImpl<ProductMapper, Product
             if (MapUtils.isNotEmpty(attachmentMap)) {
                 List<Attachment> attachments = attachmentMap.get(product.getId());
                 if (CollectionUtils.isNotEmpty(attachments)) {
-                    //筛选出主图
-                    List<String> mainIcons = attachments.stream().filter(obj -> Func.isEmpty(obj.getBusiType()) && obj.getBusiType() == AttachmentConstant.BusiType.MIAN_IMAG).map(Attachment::getPath).collect(Collectors.toList());
+                    // 筛选出主图
+                    List<String> mainIcons = attachments.stream()
+                            .filter(obj -> Objects.equals(obj.getBusiType(), AttachmentConstant.BusiType.MIAN_IMAG))
+                            .map(Attachment::getPath)
+                            .collect(Collectors.toList());
+
                     if (CollectionUtils.isNotEmpty(mainIcons)) {
                         product.setMainIcon(mainIcons.get(0));
                     }

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/mapper/BillProveMapper.xml

@@ -172,7 +172,8 @@
             collection_user_name = #{collectionUserName},
             collection_address = #{collectionAddress},
             update_user = #{updateUser},
-            update_time = NOW()
+            update_time = NOW(),
+            within_china_source = #{withinChinaSource}
         </set>
         <where>
             id = #{id}

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/prove/service/IBillProveService.java

@@ -74,7 +74,7 @@ public interface IBillProveService extends IService<BillProve> {
      * @param billProve
      * @return
      */
-    void updateCustoms(@RequestBody BillProve billProve);
+    void updateCustoms(BillProve billProve);
 
     /**
      * 根据外销合同号查询装箱数据

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/controller/PurchaseDocumentaryController.java

@@ -158,7 +158,7 @@ public class PurchaseDocumentaryController {
     /**
      * 生成pdf
      */
-    @GetMapping("/pdfPreview")
+    @PostMapping("/pdfPreview")
     public void pdfPreview(@RequestBody PdfPreviewDto pdfPreviewDto) {
         ServletOutputStream outputStream = null;
         try {

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractFlowServiceImpl.java

@@ -1,6 +1,6 @@
 package com.fjhx.purchase.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fjhx.activiti.ProcessTaskReferBuilder;
 import com.fjhx.activiti.ProcessTaskResult;
 import com.fjhx.activiti.SubmitFlowCondition;
@@ -229,14 +229,17 @@ public class PurchaseContractFlowServiceImpl implements IPurchaseContractFlowSer
             throw new ServiceException("参数缺失");
         }
         // 查询采购合同信息
-        QueryWrapper<PurchaseContract> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(PurchaseContract::getId, condition.getId()).or().eq(PurchaseContract::getProcessInstanceId, condition.getId());
+        LambdaQueryWrapper<PurchaseContract> wrapper = new LambdaQueryWrapper<PurchaseContract>()
+                .eq(PurchaseContract::getId, condition.getId())
+                .or().eq(PurchaseContract::getProcessInstanceId, condition.getId());
+
         PurchaseContract purchaseContract = iPurchaseContractService.getOne(wrapper);
         if (Func.isEmpty(purchaseContract)) {
             throw new ServiceException("采购合同不存在");
         } else if (purchaseContract.getPurchaseStatus() == PurchaseStatusEnum.INVALID.getKey()) {
             throw new ServiceException("采购合同已作废");
         }
+
         // 业务总监审批（只有该节点status有值），0：不通过（走总经理审批节点）、1：通过（走结束节点）
         String withFixedValue = null;
         if (condition.getStatus() != null) {
@@ -300,10 +303,10 @@ public class PurchaseContractFlowServiceImpl implements IPurchaseContractFlowSer
                     due.setDueMoney(BigDecimal.ZERO);
                 }
                 iWmsDueApi.saveDue(due);
-                if (purchaseContract.getPaymentFull().compareTo(BigDecimal.ZERO) == 1 &&
+                if (purchaseContract.getPaymentFull().compareTo(BigDecimal.ZERO) > 0 &&
                         purchaseContract.getPaymentCycleType() != PurchaseCycleEnum.FULL_PREPAYMENT.getKey()) {
                     String promptDate = DateUtil.dateAddASub(purchaseContract.getCreateTime(), purchaseContract.getPaymentCyclePrescribe());
-                    //添加一条预付款得账单数据
+                    // 添加一条预付款得账单数据
                     due.setId(IdUtils.fastSimpleUUID());
                     due.setPromptDate(promptDate);
                     due.setPaymentItemsType(DuePaymentItemsEnum.ADVANCE.getKey());

bladex-saas-project/saas-system-business/src/main/java/com/fjhx/common/attachment/mapper/AttachmentMapper.xml

@@ -214,7 +214,6 @@
                 #{busiId}
             </foreach>
         </where>
-
         ORDER BY
             t.create_time DESC
     </select>

bladex-saas-project/saas-system-business/src/main/java/com/fjhx/common/attachment/service/impl/AttachmentServiceImpl.java

@@ -291,8 +291,7 @@ public class AttachmentServiceImpl extends BasicsServiceImpl<AttachmentMapper, A
         if (CollectionUtils.isEmpty(list)) {
             return new HashMap<>();
         }
-        Map<String, List<Attachment>> map = list.stream().collect(Collectors.groupingBy(Attachment::getBusiId));
-        return map;
+        return list.stream().collect(Collectors.groupingBy(Attachment::getBusiId));
     }
 
 }

bladex-saas-project/service-flow/src/main/java/com/fjhx/service/example/impl/ExampleInfoServiceImpl.java

@@ -208,7 +208,6 @@ public class ExampleInfoServiceImpl extends ServiceImpl<ExampleInfoMapper, Examp
         ProcessTenant processTenant = processTenantService.getProcessTenant(code, tenantId);
         Assert.notEmpty(processTenant, "无法通过流程编码找到流程");
 
-
         List<ProcessNode> processNodeList = processNodeService.list(ProcessNode::getProcessTenantId, processTenant.getId());
 
         // 根据父节点id封装为map