Merge branch 'v9.1_ownerAppInterface_20231221' into test

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/CarrierBreakContractSavePayeeParam.java

@@ -53,4 +53,7 @@ public class CarrierBreakContractSavePayeeParam {
     @ApiModelProperty(value = "状态", example = "1",hidden = true)
     private Integer status;
 
+    @ApiModelProperty(value = "交易密码")
+    private String accountPassword;
+
 }

performance-api/src/main/java/com/clx/performance/param/pc/breakcontract/carrier/PageCarrierBreakContractSettlementOwnerParam.java

@@ -37,4 +37,7 @@ public class PageCarrierBreakContractSettlementOwnerParam extends PageParam {
     @ApiModelProperty(value="结束时间",example = "2012-01-01 00:00:00")
     private String endTime;
 
+    @ApiModelProperty(value="订单号/结算单号/货主名称/货主编码 复合搜索",example = "")
+    private String searchCondition;
+
 }

performance-api/src/main/java/com/clx/performance/param/pc/owner/OwnerPaymentSettlementParam.java

@@ -48,4 +48,6 @@ public class OwnerPaymentSettlementParam {
     @ApiModelProperty(value = "付款凭证", example = "/a.png")
     private String paymentImg;
 
+    @ApiModelProperty(value = "交易密码")
+    private String accountPassword;
 }

performance-api/src/main/java/com/clx/performance/param/pc/owner/PageOwnerSettlementParam.java

@@ -22,6 +22,18 @@ public class PageOwnerSettlementParam extends PageParam {
     @ApiModelProperty(value="订单编号",example = "201457878")
     private String orderNo;
 
+    @ApiModelProperty(value = "订单/结算单号 复合搜索", example = "JS415")
+    private String searchNo;
+
     @ApiModelProperty(value="状态 10:待锁定  20:待对账  30:待货主确认 40:待货主付款 50:待平台确认付款 60:待平台付款 70:待货主确认付款 80:待邮寄发票 90:已完结",example = "10")
     private Integer status;
+
+    @ApiModelProperty(value = "开票标识：1网运单 2普通单", example = "1")
+    private Integer invoiceType;
+
+    @ApiModelProperty(value = "开始时间", example = "1")
+    private String beginTime;
+
+    @ApiModelProperty(value = "结束时间", example = "1")
+    private String endTime;
 }

performance-web/src/main/java/com/clx/performance/dao/impl/breakcontract/BreakContractSettlementOwnerDaoImpl.java

@@ -37,6 +37,13 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
         query.eq(Objects.nonNull(param.getBreakContractPartyType()),BreakContractSettlementOwner :: getBreakContractPartyType,param.getBreakContractPartyType());
         query.ge(StringUtils.isNotBlank(param.getBeginTime()), BreakContractSettlementOwner:: getCreateTime,param.getBeginTime());
         query.le(StringUtils.isNotBlank(param.getEndTime()),BreakContractSettlementOwner :: getCreateTime,param.getEndTime());
+        if(StringUtils.isNotBlank(param.getSearchCondition())){
+            query.and(i->i.eq(BreakContractSettlementOwner :: getOrderNo,param.getSearchCondition()).or()
+                    .eq(BreakContractSettlementOwner :: getSettlementNo,param.getSearchCondition()).or()
+                    .eq(BreakContractSettlementOwner :: getOwnerName,param.getSearchCondition()).or()
+                    .eq(BreakContractSettlementOwner :: getOwnerUserNo,param.getSearchCondition())
+            );
+        }
         query.orderByDesc(BreakContractSettlementOwner::getId);
         return baseMapper.selectPage(Page.of(param.getPage(), param.getPageSize()),query);
     }

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -8,8 +8,8 @@ import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.mapper.settle.SettlementOwnerMapper;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.param.pc.owner.PageCarrierSettlementOwnerParam;
-import com.msl.common.base.Optional;
 import com.clx.performance.param.pc.owner.PageOwnerSettlementParam;
+import com.msl.common.base.Optional;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
@@ -145,6 +145,20 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         if(Objects.nonNull(param.getStatus())){
             query.eq(SettlementOwner :: getStatus,param.getStatus());
         }
+        if(Objects.nonNull(param.getSearchNo())){
+            query.and(i ->
+                    i.eq(SettlementOwner:: getOrderNo,param.getSearchNo()).or()
+                            .eq(SettlementOwner :: getSettlementNo,param.getSearchNo()));
+        }
+        if(StringUtils.isNotBlank(param.getBeginTime())){
+            query.ge(SettlementOwner :: getCreateTime,param.getBeginTime());
+        }
+        if(StringUtils.isNotBlank(param.getBeginTime())){
+            query.le(SettlementOwner :: getCreateTime,param.getEndTime());
+        }
+        if(Objects.nonNull(param.getInvoiceType())){
+            query.eq(SettlementOwner :: getInvoiceType,param.getInvoiceType());
+        }
         query.orderByDesc(SettlementOwner :: getCreateTime);
         return baseMapper.selectPage(Page.of(param.getPage(),param.getPageSize()),query);
     }

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementOwnerServiceImpl.java

 package com.clx.performance.service.impl.breakcontract;
 
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.order.feign.OrderFeign;
-import com.clx.order.vo.feign.FeignOrderVO;
 import com.clx.order.vo.pc.owner.OwnerQuotationDetailVO;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
+import com.clx.performance.dao.OwnerAccountPasswordDao;
 import com.clx.performance.dao.breakcontract.BreakContractOwnerRecordDao;
 import com.clx.performance.dao.breakcontract.BreakContractOwnerRuleDao;
 import com.clx.performance.dao.breakcontract.BreakContractSettlementLogDao;
@@ -19,6 +18,7 @@ import com.clx.performance.enums.*;
 import com.clx.performance.extranal.order.QuotationService;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OrderGoods;
+import com.clx.performance.model.OwnerAccountPassword;
 import com.clx.performance.model.breakcontract.BreakContractOwnerRecord;
 import com.clx.performance.model.breakcontract.BreakContractOwnerRule;
 import com.clx.performance.model.breakcontract.BreakContractSettlementLog;
@@ -32,6 +32,7 @@ import com.clx.performance.service.breakcontract.BreakContractSettlementLogServi
 import com.clx.performance.service.breakcontract.BreakContractSettlementOwnerService;
 import com.clx.performance.struct.breakcontract.BreakContractSettlementLogStruct;
 import com.clx.performance.struct.breakcontract.BreakContractSettlementOwnerStruct;
+import com.clx.performance.utils.MyMD5Util;
 import com.clx.performance.utils.excel.ExcelData;
 import com.clx.performance.utils.excel.ExcelField;
 import com.clx.performance.utils.excel.ExcelSheet;
@@ -48,6 +49,7 @@ import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
@@ -83,6 +84,7 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
     private final BreakContractOwnerRecordService breakContractOwnerRecordService;
     private final BreakContractOwnerRecordDao breakContractOwnerRecordDao;
     private final OrderGoodsDao orderGoodsDao;
+    private final OwnerAccountPasswordDao ownerAccountPasswordDao;
 
 
     
@@ -267,6 +269,18 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveOwnerBreakContractPayee(CarrierBreakContractSavePayeeParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) {
+            OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getUserNo());
+            try {
+                boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword());
+                if (!b) {
+                    throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
+                }
+            } catch (Exception e) {
+                throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
+            }
+        }
         BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
         if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode())){
             throw new ServiceSystemException(PerformanceResultEnum.STATUS_CHANGED);
@@ -281,7 +295,6 @@ public class BreakContractSettlementOwnerServiceImpl  implements BreakContractSe
         record.setPayTime(LocalDateTime.now());
         breakContractOwnerRecordDao.uploadPayTime(record);
 
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         //保存结算单日志----货主付款
         breakContractSettlementLogService.saveBreakSettlementLog(settlementOwner.getSettlementNo(),
                 BreakContractSettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getCode(),BreakContractSettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getMsg(),

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.component.NetworkSyncComponent;
+import com.clx.performance.dao.OwnerAccountPasswordDao;
 import com.clx.performance.dao.settle.SettlementLogDao;
 import com.clx.performance.dao.settle.SettlementOwnerDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
@@ -12,6 +13,11 @@ import com.clx.performance.dto.InvoicingStatusNotifyDTO;
 import com.clx.performance.enums.OrderChildLogEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.settle.*;
+import com.clx.performance.enums.settle.SettlementLogEnum;
+import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
+import com.clx.performance.enums.settle.SettlementOwnerEnum;
+import com.clx.performance.enums.settle.SettlementWayEnum;
+import com.clx.performance.model.OwnerAccountPassword;
 import com.clx.performance.model.settle.SettlementLog;
 import com.clx.performance.model.settle.SettlementOwner;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
@@ -23,6 +29,7 @@ import com.clx.performance.service.settle.SettlementMqHandlerService;
 import com.clx.performance.service.settle.SettlementOwnerService;
 import com.clx.performance.struct.settle.SettlementLogStruct;
 import com.clx.performance.struct.settle.SettlementOwnerStruct;
+import com.clx.performance.utils.MyMD5Util;
 import com.clx.performance.utils.excel.ExcelData;
 import com.clx.performance.utils.excel.ExcelField;
 import com.clx.performance.utils.excel.ExcelSheet;
@@ -36,6 +43,7 @@ import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -76,6 +84,8 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
     private final SettlementMqHandlerService settlementMqHandlerService;
 
 
+    private final OwnerAccountPasswordDao ownerAccountPasswordDao;
+
 
     @Override
     public CarrierSettlementOwnerDetailVO getCarrierSettlementOwnerDetail(Integer id) {
@@ -198,6 +208,20 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
 
     @Override
     public void updatePaymentSettlement(OwnerPaymentSettlementParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) {
+            OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getUserNo());
+            try {
+                boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword());
+                if (!b) {
+                    throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
+                }
+            } catch (Exception e) {
+                throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
+            }
+        }
+
+
         //结算单详情
         SettlementOwner settlementOwner =settlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
@@ -215,7 +239,6 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 .status(SettlementOwnerEnum.Status.PLATFORM_CONFIRMED_OWNER_PAYMENT.getCode()).build();
         settlementOwnerDao.updatePayment(settlement);
 
-        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
         //保存结算单日志
         settlementLogService.saveSettlementLog(settlementNo,
                 SettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getCode(),SettlementLogEnum.Type.SHIPPER_TO_PAYMENT.getMsg(),