Merge branch 'master' into test

hx-account/src/main/java/com/fjhx/account/flow/AccountRequestFundsFlow.java

@@ -141,6 +141,9 @@ public class AccountRequestFundsFlow extends FlowDelegate {
         if ("3".equals(accountRequestFunds.getType())) {
             BigDecimal subtract = accountRequestFunds.getTotal().subtract(accountRequestFunds.getAdvanceAmounts());
             accountPayment.setAmount(subtract);
+            if(subtract.compareTo(BigDecimal.ZERO)==0){//不生成打款数据
+                return;
+            }
         } else {
             accountPayment.setAmount(accountRequestFunds.getTotal());
         }

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -370,6 +370,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
     @Override
     public void taxRefund(AccountRunningWaterDto dto) {
         dto.setStatus("10");
+        dto.setType("40");//退税
         add(dto);
         List<TaxRefundDetails> taxRefundDetailsList = dto.getTaxRefundDetailsList();
         taxRefundDetailsList.forEach(item -> item.setAccountRunningWaterId(dto.getId()));

hx-account/src/main/resources/mapper/account/AccountRunningWaterMapper.xml

@@ -3,46 +3,50 @@
 <mapper namespace="com.fjhx.account.mapper.account.AccountRunningWaterMapper">
     <!--这段代码正常是不需要跨库查询的。但是一开始封装包的时候分装的不合理，pom里面包是不能互相引用的。account包继承sale包会出现依赖冲突，目前不好改动，只能跨库查询-->
     <select id="getPage" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">
-        SELECT arw.*,
-               (SELECT IF
-                           (t1.type = 20, GROUP_CONCAT(c.`code`), GROUP_CONCAT(t4.`code`)) contractCodes
-                FROM account_payment t1
-                         LEFT JOIN account_request_funds t2 ON t1.business_id = t2.id
-                         LEFT JOIN account_request_funds_detail t3 ON t2.id = t3.account_request_funds_id
-                         LEFT JOIN `bytesailing_sale`.contract t4 ON t3.contract_id = t4.id
-                    --采购付款来源
-                         LEFT JOIN bytesailing_purchase.pay pa ON t1.business_id = pa.id
-                         LEFT JOIN bytesailing_purchase.pay_detail pad
-        ON pad.pay_id = pa.id
-            LEFT JOIN bytesailing_purchase.purchase p ON pad.purchase_id = p.id
-            LEFT JOIN bytesailing_sale.contract c ON p.data_resource_id = c.id
-        WHERE
-            t1.id = arw.business_id
-            ) AS contractCodes
-            , (
-        SELECT
-            IF
-            ( t1.type = 20, GROUP_CONCAT( c.id ), GROUP_CONCAT( t4.id ) ) contractIds
-        FROM
-            account_payment t1
-            LEFT JOIN account_request_funds t2
-        ON t1.business_id = t2.id
-            LEFT JOIN account_request_funds_detail t3 ON t2.id = t3.account_request_funds_id
-            LEFT JOIN `bytesailing_sale`.contract t4 ON t3.contract_id = t4.id
-            --采购付款来源
-            LEFT JOIN bytesailing_purchase.pay pa ON t1.business_id = pa.id
-            LEFT JOIN bytesailing_purchase.pay_detail pad ON pad.pay_id = pa.id
-            LEFT JOIN bytesailing_purchase.purchase p ON pad.purchase_id = p.id
-            LEFT JOIN bytesailing_sale.contract c ON p.data_resource_id = c.id
-        WHERE
-            t1.id = arw.business_id
-            ) AS contractIds
-            , am.alias accountManagementName
-            , am.corporation_id
-        FROM
-            account_running_water arw
-            LEFT JOIN account_management am
-        ON arw.account_management_id = am.id
+        SELECT arw.*
+             , if(arw.type = 40, (select GROUP_CONCAT(c.`code`)
+                                  from tax_refund_details trd
+                                           left join bytesailing_sale.contract c on c.id = trd.contract_id
+                                  where trd.account_running_water_id = arw.id),
+                  (SELECT IF
+                              (t1.type = 20, GROUP_CONCAT(c.`code`), GROUP_CONCAT(t4.`code`)) contractCodes
+                   FROM account_payment t1
+                            LEFT JOIN account_request_funds t2 ON t1.business_id = t2.id
+                            LEFT JOIN account_request_funds_detail t3 ON t2.id = t3.account_request_funds_id
+                            LEFT JOIN `bytesailing_sale`.contract t4 ON t3.contract_id = t4.id
+                       --采购付款来源
+                            LEFT JOIN bytesailing_purchase.pay pa ON t1.business_id = pa.id
+                            LEFT JOIN bytesailing_purchase.pay_detail pad
+                      ON pad.pay_id = pa.id
+                      LEFT JOIN bytesailing_purchase.purchase p ON pad.purchase_id = p.id
+                      LEFT JOIN bytesailing_sale.contract c ON p.data_resource_id = c.id
+                      WHERE
+                      t1.id = arw.business_id ) )AS contractCodes
+
+             , if(arw.type = 40, (select GROUP_CONCAT(trd.contract_id)
+                                  from tax_refund_details trd
+                                  where trd.account_running_water_id = arw.id), (SELECT IF
+                                                                                            (t1.type = 20,
+                                                                                             GROUP_CONCAT(c.id),
+                                                                                             GROUP_CONCAT(t4.id)) contractIds
+                                                                                 FROM account_payment t1
+                                                                                          LEFT JOIN account_request_funds t2
+                                                                                                    ON t1.business_id = t2.id
+                                                                                          LEFT JOIN account_request_funds_detail t3 ON t2.id = t3.account_request_funds_id
+                                                                                          LEFT JOIN `bytesailing_sale`.contract t4
+                                                                                                    ON t3.contract_id = t4.id
+                                                                                     --采购付款来源
+                                                                                          LEFT JOIN bytesailing_purchase.pay pa ON t1.business_id = pa.id
+                                                                                          LEFT JOIN bytesailing_purchase.pay_detail pad ON pad.pay_id = pa.id
+                      LEFT JOIN bytesailing_purchase.purchase p ON pad.purchase_id = p.id
+                      LEFT JOIN bytesailing_sale.contract c ON p.data_resource_id = c.id
+                      WHERE
+                      t1.id = arw.business_id )) AS contractIds
+             , am.alias                             accountManagementName
+             , am.corporation_id
+        FROM account_running_water arw
+                 LEFT JOIN account_management am
+                           ON arw.account_management_id = am.id
             ${ew.customSqlSegment}
     </select>
     <select id="getDetail" resultType="com.fjhx.account.entity.account.vo.AccountRunningWaterVo">

hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

@@ -104,14 +104,14 @@ public class PayFlow extends FlowDelegate {
         AccountPayment payment = new AccountPayment();
         payment.setAccountManagementId(pay.getAccountManagementId());
         payment.setBusinessId(pay.getId());
-        // todo 暂时写死人民币
-        payment.setCurrency("CNY");
+        payment.setCurrency(pay.getCurrency());
         payment.setPaymentRemark(pay.getRemark());
         payment.setType(PaymentTypeEnum.REJECT.getKey());
         payment.setStatus(PaymentStatusEnum.UNDER_REVIEW.getKey());
         payment.setAmount(pay.getAmount());
         payment.setIncomeAmount(pay.getAmount());
         payment.setName(pay.getName());
+        payment.setCreateUser(pay.getCreateUser());
         payment.setBusinessManagementId(pay.getAccountManagementId());
         payment.setOpeningBank(pay.getOpeningBank());
         payment.setBusinessCurrency(pay.getCurrency());

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/SalePurchaseServiceImpl.java

@@ -1,71 +1,30 @@
 package com.fjhx.sale.service.purchase.impl;
 
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.extra.spring.SpringUtil;
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.JSONWriter;
-import com.baomidou.dynamic.datasource.annotation.DS;
+
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.common.entity.documentary.bo.DocumentaryData;
-import com.fjhx.common.enums.CodingRuleEnum;
-import com.fjhx.common.service.coding.CodingRuleService;
-import com.fjhx.common.service.documentary.GetDocumentaryBusinessTemplate;
-import com.fjhx.item.entity.product.vo.ProductInfoVo;
-import com.fjhx.item.service.product.ProductInfoService;
-import com.fjhx.purchase.entity.invoice.vo.InvoiceDetailsVo;
-import com.fjhx.purchase.entity.pay.vo.PayDetailVo;
-import com.fjhx.purchase.entity.purchase.bo.PurchaseDocumentaryBo;
+
 import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
-import com.fjhx.purchase.entity.purchase.po.PurchasePayRecordDetail;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseDocumentaryVo;
-import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
-import com.fjhx.purchase.entity.subscribe.po.Subscribe;
-import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.fjhx.purchase.mapper.purchase.PurchaseMapper;
-import com.fjhx.purchase.service.arrival.ArrivalDetailService;
-import com.fjhx.purchase.service.invoice.InvoiceDetailsService;
-import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
-import com.fjhx.purchase.service.purchase.PurchasePayRecordDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
-import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
-import com.fjhx.purchase.service.subscribe.SubscribeService;
-import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.po.ContractProduct;
 import com.fjhx.sale.entity.sample.po.SampleProduct;
 import com.fjhx.sale.service.contract.ContractProductService;
-import com.fjhx.sale.service.contract.ContractService;
 import com.fjhx.sale.service.purchase.SalePurchaseService;
 import com.fjhx.sale.service.sample.SampleProductService;
-import com.fjhx.supply.entity.supplier.po.SupplierInfo;
-import com.fjhx.supply.service.supplier.SupplierInfoService;
-import com.fjhx.wms.entity.warehouse.po.Warehouse;
-import com.fjhx.wms.service.warehouse.WarehouseService;
-import com.ruoyi.common.core.domain.BaseIdPo;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 
 /**
@@ -76,7 +35,6 @@ import java.util.stream.Collectors;
  * @author
  * @since 2023-04-06
  */
-@DS(SourceConstant.PURCHASE)
 @Service
 public class SalePurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         implements SalePurchaseService {
@@ -140,6 +98,6 @@ public class SalePurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchas
                 sampleProductService.updateBatchById(upSampleProductList);
             }
         }
-        this.updateById(purchaseDto);
+        purchaseService.updateById(purchaseDto);
     }
 }