Merge branch 'test' into dev

# Conflicts:
#	hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java
#	hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java
#	hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractMapper.java
#	hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java
#	hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java
#	hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

hx-admin/src/main/resources/application-dev.yml

@@ -117,3 +117,117 @@ token:
     secret: abcdefghijklmnopqrstuvwxyz
     # 令牌有效期（默认30分钟）
     expireTime: 2880
+
+
+
+## 数据源配置
+#spring:
+#    datasource:
+#        dynamic:
+#            strict: true
+#            primary: base
+#            datasource:
+#                victoriatourist:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                common:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                oa:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                mes:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                wms:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                item:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_item?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                supply:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_supply?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                base:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                iot:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_iot?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                customer:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_customer?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                purchase:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_purchase?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                account:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_account?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                sale:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_sale?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                mail:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_mail?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#                kd100:
+#                    url: jdbc:mysql://110.41.2.116:23063/bytesailing_kd100?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+#                    username: bytesailing_db_user
+#                    password: kfG-A93-w7h-qX8
+#
+#    # redis 配置
+#    redis:
+#        # 地址
+#        host: 139.159.251.109
+#        # 端口，默认为6379
+#        port: 31347
+#        # 数据库索引
+#        database: 1
+#        # 密码
+#        password: w3G_11h4YjrsO_6P5Oi
+#        # 连接超时时间
+#        timeout: 10s
+#        lettuce:
+#            pool:
+#                # 连接池中的最小空闲连接
+#                min-idle: 0
+#                # 连接池中的最大空闲连接
+#                max-idle: 8
+#                # 连接池的最大数据库连接数
+#                max-active: 8
+#                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+#                max-wait: -1ms
+#
+#server:
+#    servlet:
+#        context-path: /prod-api
+#
+#mail:
+#    # 调用邮箱服务url前缀
+#    urlPrefix: http://localhost:8088/mailService/
+#    abroadUrlPrefix: http://159.138.54.234:8088/mailService/
+#
+#hx:
+#    httpUrl: http://139.159.251.109:81/prod-api/
+#
+## token配置
+#token:
+#    # 令牌自定义标识
+#    header: Authorization
+#    # 令牌密钥
+#    secret: abcdefghijklmnopqrstuvwxyz
+#    # 令牌有效期（默认30分钟）
+#    expireTime: 240

hx-purchase/src/main/java/com/fjhx/purchase/controller/purchase/PurchaseController.java

@@ -1,17 +1,16 @@
 package com.fjhx.purchase.controller.purchase;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.constant.SourceConstant;
-import com.fjhx.purchase.entity.purchase.dto.PurchasePayRecordDto;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
+import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseSelectDto;
-import com.fjhx.purchase.entity.purchase.dto.PurchaseDto;
-import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.fjhx.purchase.service.purchase.PurchaseService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -91,7 +90,7 @@ public class PurchaseController {
     /**
      * 采购编辑
      */
-    @PostMapping("/edit")
+//    @PostMapping("/edit")
     public void edit(@RequestBody PurchaseDto purchaseDto) {
         purchaseService.edit(purchaseDto);
     }

hx-sale/src/main/java/com/fjhx/sale/controller/contract/ContractController.java

@@ -72,7 +72,7 @@ public class ContractController {
     /**
      * 外销合同表编辑
      */
-    @PostMapping("/edit")
+//    @PostMapping("/edit")
     public void edit(@RequestBody ContractDto contractDto) {
         contractService.edit(contractDto);
     }
@@ -259,7 +259,7 @@ public class ContractController {
      * 头部统计客户金额
      */
     @PostMapping("/getHeadCustomerStatistics")
-    public Map<String,Object> getHeadCustomerStatistics(@RequestBody ContractSelectDto dto) {
+    public Map<String, Object> getHeadCustomerStatistics(@RequestBody ContractSelectDto dto) {
         return contractService.getHeadCustomerStatistics(dto);
     }
 

hx-sale/src/main/java/com/fjhx/sale/entity/sample/dto/SampleSelectDto.java

@@ -18,4 +18,9 @@ public class SampleSelectDto extends BaseSelectDto {
      * 审批状态
      */
     private String status;
+
+    /**
+     * 业务员ID
+     */
+    private String userId;
 }

hx-sale/src/main/java/com/fjhx/sale/flow/ContractUpdateFlow.java

@@ -133,7 +133,7 @@ public class ContractUpdateFlow extends FlowDelegate {
             newCp.setExpendQuantity(newCp.getQuantity());
             if (ObjectUtil.isNotEmpty(newCp.getId())) {//如果新合同产品ID不为空
                 //取出旧合同
-                ContractProduct oldContractProduct = oldContractProductMap.getOrDefault(newCp.getId(),null).get(0);
+                ContractProduct oldContractProduct = oldContractProductMap.getOrDefault(newCp.getId(), null).get(0);
 //                //取出旧合同包装方式
 //                JSONObject oldJson = JSONObject.parseObject(oldContractProduct.getEhsdJson());
 //                String oldPackMethod = oldJson.getOrDefault("packMethod",null)==null?null:oldJson.getOrDefault("packMethod",null).toString();
@@ -143,10 +143,10 @@ public class ContractUpdateFlow extends FlowDelegate {
                 /**
                  * 商品英文名、尺寸、包装方式、数量 没有变更---取原本的剩余数量
                  */
-                if(oldContractProduct.getQuantity().compareTo(newCp.getQuantity())==0){//如果数量没有变动
+                if (oldContractProduct.getQuantity().compareTo(newCp.getQuantity()) == 0) {//如果数量没有变动
                     //取出旧的剩余数量
                     newCp.setExpendQuantity(oldContractProduct.getExpendQuantity());
-                }else{//变动了
+                } else {//变动了
                     BigDecimal quantity = newCp.getQuantity().subtract(oldContractProduct.getQuantity()).subtract(oldContractProduct.getExpendQuantity());//剩余数量
                     newCp.setExpendQuantity(quantity);
                 }
@@ -291,30 +291,31 @@ public class ContractUpdateFlow extends FlowDelegate {
 
 
         List<ClaimContract> claimContractList = claimContractService.list(Wrappers.<ClaimContract>query().lambda().eq(ClaimContract::getContractId,oldContractId));
-        List<Long> claimIds = claimContractList.stream().map(ClaimContract::getClaimId).collect(Collectors.toList());
-        List<Long> claimContractIds = claimContractList.stream().map(ClaimContract::getId).collect(Collectors.toList());
-        //取出到账认领数据
-        List<Claim> claims = claimService.list(q -> q.in(Claim::getId, CollectionUtils.isEmpty(claimIds)? Arrays.asList("0000"):claimIds));
-        for(Claim c : claims){
-            //查询流水数据
-            AccountRunningWater accountRunningWater = accountRunningWaterService.getById(c.getBusinessId());
-            BigDecimal sumClaimMoney = accountRunningWater.getClaimAmount().subtract(c.getAmount());
-            //更新流水数据为认领状态---已认领金额还原
-            AccountRunningWater water = new AccountRunningWater();
-            if(sumClaimMoney.compareTo(BigDecimal.ZERO)>0){
-                water.setIsClaim(2);//部分认领
-            }else{
-                water.setIsClaim(0);//未认领
+        if (ObjectUtil.isNotEmpty(claimContractList)) {
+            List<Long> claimIds = claimContractList.stream().map(ClaimContract::getClaimId).collect(Collectors.toList());
+            List<Long> claimContractIds = claimContractList.stream().map(ClaimContract::getId).collect(Collectors.toList());
+            //取出到账认领数据
+            List<Claim> claims = claimService.list(q -> q.in(Claim::getId, CollectionUtils.isEmpty(claimIds) ? Arrays.asList("0000") : claimIds));
+            for (Claim c : claims) {
+                //查询流水数据
+                AccountRunningWater accountRunningWater = accountRunningWaterService.getById(c.getBusinessId());
+                BigDecimal sumClaimMoney = accountRunningWater.getClaimAmount().subtract(c.getAmount());
+                //更新流水数据为认领状态---已认领金额还原
+                AccountRunningWater water = new AccountRunningWater();
+                if (sumClaimMoney.compareTo(BigDecimal.ZERO) > 0) {
+                    water.setIsClaim(2);//部分认领
+                } else {
+                    water.setIsClaim(0);//未认领
+                }
+                water.setId(c.getBusinessId());
+                water.setClaimAmount(sumClaimMoney);
+                accountRunningWaterService.updateById(water);
             }
-            water.setId(c.getBusinessId());
-            water.setClaimAmount(sumClaimMoney);
-            accountRunningWaterService.updateById(water);
+            //删除到账认领数据
+            claimContractService.remove(q -> q.in(ClaimContract::getId, claimContractIds));
+            //删除到账认领数据
+            claimService.remove(q -> q.in(Claim::getId, claimIds));
         }
-        //删除到账认领数据
-        claimContractService.remove(q -> q.in(ClaimContract::getId, claimContractIds));
-        //删除到账认领数据
-        claimService.remove(q -> q.in(Claim::getId, claimIds));
-
 
         oldContract.setUpId(temOldId);
         oldContract.setIsShow(1);//隐藏旧合同

hx-sale/src/main/java/com/fjhx/sale/mapper/contract/ContractMapper.java

@@ -103,5 +103,5 @@ public interface ContractMapper extends BaseMapper<Contract> {
 
     void updateContract(Contract contract);
 
-    List<ContractVo> getCustomerMoney( @Param("ew") IWrapper<Contract> wrapper);
+    List<ContractVo> getCustomerMoney(@Param("ew") IWrapper<Contract> wrapper);
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/ContractService.java

@@ -188,8 +188,11 @@ public interface ContractService extends BaseService<Contract> {
      */
     List<AccountRunningWaterVo> getAccountRunningWaterByContractId(Long contractId);
 
+    void updateContract(Contract contract);
+
     /**
      * 统计头部客户金额
+     *
      * @return
      */
     Map<String,Object> getHeadCustomerStatistics(ContractSelectDto dto);

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -23,7 +23,6 @@ import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.common.entity.corporation.po.Corporation;
 import com.fjhx.common.entity.currency.po.CurrencyRate;
 import com.fjhx.common.entity.documentary.bo.DocumentaryData;
-import com.fjhx.common.enums.CodingRuleEnum;
 import com.fjhx.common.enums.FlowStatusEnum1;
 import com.fjhx.common.service.coding.CodingRuleService;
 import com.fjhx.common.service.corporation.CorporationService;
@@ -73,7 +72,6 @@ import com.fjhx.sale.service.purchase.EhsdPurchaseProductService;
 import com.fjhx.tenant.entity.dict.dto.DictTenantDataSelectDto;
 import com.fjhx.tenant.entity.dict.vo.DictTenantDataVo;
 import com.fjhx.tenant.service.dict.DictTenantDataService;
-import com.github.pagehelper.util.StringUtil;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.core.domain.BaseSelectDto;
@@ -260,12 +258,14 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
             wrapper.eq("t1", Contract::getSellCorporationId, dto.getSellCorporationId());
         }
         if (StringUtils.isNotEmpty(dto.getRefundStatusNew())) {
-            wrapper.in("t1.refundStatusNew", Arrays.asList(dto.getRefundStatusNew().split(",")));
+            wrapper.in("t1.refund_status", Arrays.asList(dto.getRefundStatusNew().split(",")));
         }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1", Contract::getCode));
         }
-
+        if (StringUtils.isNotEmpty(dto.getUserId())) {
+            wrapper.eq("t1", Contract::getCreateUser, dto.getUserId());
+        }
         //根据客户id关联
         wrapper.eq(ContractVo::getBuyCorporationId, dto.getCustomerId());
 

hx-sale/src/main/java/com/fjhx/sale/service/documents/impl/DocumentsPdfServiceImpl.java

@@ -1,27 +1,26 @@
 package com.fjhx.sale.service.documents.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.fjhx.sale.entity.documents.po.Documents;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.sale.entity.documents.dto.DocumentsPdfDto;
+import com.fjhx.sale.entity.documents.dto.DocumentsPdfSelectDto;
 import com.fjhx.sale.entity.documents.po.DocumentsPdf;
 import com.fjhx.sale.entity.documents.po.DocumentsProduct;
+import com.fjhx.sale.entity.documents.vo.DocumentsPdfVo;
 import com.fjhx.sale.mapper.documents.DocumentsPdfMapper;
 import com.fjhx.sale.service.documents.DocumentsPdfService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.sale.service.documents.DocumentsProductService;
 import com.fjhx.sale.service.documents.DocumentsService;
 import com.ruoyi.common.exception.ServiceException;
 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 com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.sale.entity.documents.vo.DocumentsPdfVo;
-import com.fjhx.sale.entity.documents.dto.DocumentsPdfSelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.fjhx.sale.entity.documents.dto.DocumentsPdfDto;
-import cn.hutool.core.bean.BeanUtil;
 
 import java.util.Map;
 
@@ -96,7 +95,7 @@ public class DocumentsPdfServiceImpl extends ServiceImpl<DocumentsPdfMapper, Doc
     public void add(DocumentsPdfDto documentsPdfDto) {
         DocumentsPdf documentsPdf = this.getOne(Wrappers.<DocumentsPdf>query().lambda().eq(DocumentsPdf::getDocumentId,documentsPdfDto.getDocumentId()));
         if(ObjectUtil.isEmpty(documentsPdf)){
-            this.save(documentsPdf);
+            this.save(documentsPdfDto);
         }else{
             this.update(documentsPdfDto,Wrappers.<DocumentsPdf>query().lambda().eq(DocumentsPdf::getDocumentId,documentsPdfDto.getDocumentId()));
         }

hx-sale/src/main/java/com/fjhx/sale/service/sample/impl/SampleServiceImpl.java

@@ -11,6 +11,7 @@ import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.sale.entity.contract.po.Contract;
 import com.fjhx.sale.entity.contract.vo.ContractProductVo;
 import com.fjhx.sale.entity.sample.dto.SampleDto;
 import com.fjhx.sale.entity.sample.dto.SampleSelectDto;
@@ -63,6 +64,9 @@ public class SampleServiceImpl extends ServiceImpl<SampleMapper, Sample> impleme
         if (StringUtils.isNotEmpty(dto.getStatus())) {
             wrapper.eq("s", Sample::getStatus, dto.getStatus());
         }
+        if (StringUtils.isNotEmpty(dto.getUserId())) {
+            wrapper.eq("s", Sample::getCreateUser, dto.getUserId());
+        }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("s", Sample::getCode));
         }