客户

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchaseOrderServiceImpl.java

@@ -137,7 +137,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
         purchaseClosingReport.setCustomerName(purchaseOrder.getSeller());
         purchaseClosingReport.setStatusFlag(StatusEnum.FORM_REVIEWED.getFlag());
         purchaseClosingReport.setStatus(StatusEnum.FORM_REVIEWED.getName());
-        if(purchaseOrder.getClosingPositionPayable() < 0 ){
+        if (purchaseOrder.getClosingPositionPayable() < 0) {
             purchaseClosingReport.setCollectionIngPayable(Math.abs(purchaseOrder.getClosingPositionPayable()));
         }
         if (procurementPlanInfo != null) {
@@ -273,16 +273,16 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
         List<PurchaseOrder> dataList = baseMapper.getListByCondition(pageView);
         if (!CollectionUtils.isEmpty(dataList)) {
             for (PurchaseOrder purchaseOrdera : dataList) {
-                ProcurementPlanInfo procurementPlanInfo=procurementPlanInfoService.selectById(purchaseOrdera.getPlanId());
-                if (procurementPlanInfo!=null){
+                ProcurementPlanInfo procurementPlanInfo = procurementPlanInfoService.selectById(purchaseOrdera.getPlanId());
+                if (procurementPlanInfo != null) {
                     purchaseOrdera.setProcurementPlanType(procurementPlanInfo.getProcurementPlanType());
                     purchaseOrdera.setTradingTarget(procurementPlanInfo.getTitle());
                 }
                 //查询合同Id
-                ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                         .eq("contract_no",purchaseOrdera.getContractNo())
-                         .eq("delete_flag","0"));
-                if (contractManagementInfo!=null){
+                ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("contract_no", purchaseOrdera.getContractNo())
+                        .eq("delete_flag", "0"));
+                if (contractManagementInfo != null) {
                     purchaseOrdera.setContractId(contractManagementInfo.getId());
                     purchaseOrdera.setGoodsType(contractManagementInfo.getGoodsType());
                 }
@@ -303,13 +303,13 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                 List<PriceChangeRecord> priceChangeRecordList = priceChangeRecordService.selectList(new EntityWrapper<PriceChangeRecord>()
                         .eq("order_id", purchaseOrdera.getId())
                         .eq("delete_flag", "0")
-                        .orderBy("create_date",false));
+                        .orderBy("create_date", false));
                 //查询成交记录
                 List<TransactionRecord> transactionRecordList = transactionRecordService.selectList(new EntityWrapper<TransactionRecord>()
                         .eq("order_id", purchaseOrdera.getId())
                         .eq("record_flag", "0")
                         .eq("delete_flag", "0")
-                        .orderBy("deal_date",false));
+                        .orderBy("deal_date", false));
                 if (!CollectionUtils.isEmpty(transactionRecordList)) {
                     Float cumulativeTurnover = 0.0f;
                     for (TransactionRecord transactionRecord : transactionRecordList) {
@@ -344,7 +344,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
                         .eq("order_id", purchaseOrdera.getId())
                         .eq("record_flag", "1")
                         .eq("delete_flag", "0")
-                        .orderBy("deal_date",false));
+                        .orderBy("deal_date", false));
                 if (!CollectionUtils.isEmpty(closePositionList)) {
                     Float closedPosition = 0.0f;
                     for (TransactionRecord transactionRecord : closePositionList) {
@@ -453,7 +453,15 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
         // 操作主表数据
         boolean one = this.insert(purchaseOrder);
         // 添加客户信息
-
+        int count = customerInfoService.selectCount(new EntityWrapper<CustomerInfo>().eq("customer_phone", purchaseOrder.getSellerPhone())
+                .eq("delete_flag", "0"));
+        if (count > 0) {
+            CustomerInfo customerInfo = new CustomerInfo();
+            customerInfo.setCustomerName(purchaseOrder.getSeller());
+            customerInfo.setCustomerPhone(purchaseOrder.getSellerPhone());
+            customerInfo.setCompId(purchaseOrder.getCompId());
+            customerInfoService.addCustomerInfo(customerInfo);
+        }
         if (one) {
             return "OK";
         } else {
@@ -535,7 +543,7 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
     @Override
     public String editPurchaseOrder(PurchaseOrder purchaseOrder) {
         //现货审核通过
-        if ("现货".equals(purchaseOrder.getProcurementPlanType())){
+        if ("现货".equals(purchaseOrder.getProcurementPlanType())) {
             purchaseOrder.setStatusFlag(StatusEnum.ORDER_COMPLETED.getFlag());
             purchaseOrder.setStatus(StatusEnum.ORDER_COMPLETED.getName());
         }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/SaleOrderServiceImpl.java

@@ -411,27 +411,38 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
         saleOrder.setOrderType("销售");
         // 操作主表数据
         boolean one = this.insert(saleOrder);
-        boolean isStartWorkflow = StringUtils.isBlank(saleOrder.getWorkflowId());
+//        boolean isStartWorkflow = StringUtils.isBlank(saleOrder.getWorkflowId());
         // 不是退回的单子
-        if (isStartWorkflow) {
-            Workflow workflow = workflowService
-                    .findLatestWorkflowByBusinessCode("PURCHASE-ORDER-APPROVE");
-            // 没配置审核流程，直接结束并处理信息
-            if (workflow == null) {
-                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-            }
-            // 开启审核流
-            else {
-                // 设置状态 已提交审核
-                saleOrder.setWorkflowId(workflow.getId());
-                this.updateById(saleOrder);
-                workflowService.startInstance(workflow.getId(), saleOrder.getId());
-            }
-        }
-        // 退回的单子 再启用
-        else {
-            this.updateById(saleOrder);
-            workflowService.activateInstance(saleOrder.getWorkflowId(), saleOrder.getId());
+//        if (isStartWorkflow) {
+//            Workflow workflow = workflowService
+//                    .findLatestWorkflowByBusinessCode("PURCHASE-ORDER-APPROVE");
+//            // 没配置审核流程，直接结束并处理信息
+//            if (workflow == null) {
+//                throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+//            }
+//            // 开启审核流
+//            else {
+//                // 设置状态 已提交审核
+//                saleOrder.setWorkflowId(workflow.getId());
+//                this.updateById(saleOrder);
+//                workflowService.startInstance(workflow.getId(), saleOrder.getId());
+//            }
+//        }
+//        // 退回的单子 再启用
+//        else {
+//            this.updateById(saleOrder);
+//            workflowService.activateInstance(saleOrder.getWorkflowId(), saleOrder.getId());
+//        }
+
+        // 添加客户信息
+        int count = customerInfoService.selectCount(new EntityWrapper<CustomerInfo>().eq("customer_phone", saleOrder.getBuyerPhone())
+                .eq("delete_flag", "0"));
+        if (count > 0) {
+            CustomerInfo customerInfo = new CustomerInfo();
+            customerInfo.setCustomerName(saleOrder.getBuyer());
+            customerInfo.setCustomerPhone(saleOrder.getBuyerPhone());
+            customerInfo.setCompId(saleOrder.getCompId());
+            customerInfoService.addCustomerInfo(customerInfo);
         }
         if (one) {
             return "OK";