Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/feign/IAgreementClient.java

@@ -23,7 +23,7 @@ public interface IAgreementClient {
 	String DECLARE_CUSTOMS_PASS_CANCEL = APP_PREFIX + "/passCancelAgreement";
 
 	@GetMapping(GET_BY_ID)
-	Agreement getById(@RequestParam("id") Long id);
+	Agreement getByAgreementId(@RequestParam("id") Long id);
 
 	/**
 	 * 审核通过
@@ -31,7 +31,7 @@ public interface IAgreementClient {
 	 * @return
 	 */
 	@PostMapping(DECLARE_CUSTOMS_PASS_CHECK)
-	R passCheck(@RequestParam("id") Long id);
+	R agreementPassCheck(@RequestParam("id") Long id);
 
 	/**
 	 * 审核中
@@ -39,7 +39,7 @@ public interface IAgreementClient {
 	 * @return
 	 */
 	@PostMapping(DECLARE_CUSTOMS_UNDER_REVIEW)
-	R underReview(@RequestParam("id") Long id);
+	R agreementUnderReview(@RequestParam("id") Long id);
 
 	/**
 	 * 审核驳回
@@ -47,5 +47,5 @@ public interface IAgreementClient {
 	 * @return
 	 */
 	@PostMapping(DECLARE_CUSTOMS_PASS_CANCEL)
-	R passCancel(@RequestParam("id") Long id);
+	R agreementPassCancel(@RequestParam("id") Long id);
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/feign/AgreementClient.java

@@ -17,7 +17,7 @@ public class AgreementClient implements IAgreementClient{
 	private final IAgreementService agreementService;
 
 	@Override
-	public Agreement getById(Long id) {
+	public Agreement getByAgreementId(Long id) {
 		return agreementService.getById(id);
 	}
 
@@ -27,7 +27,7 @@ public class AgreementClient implements IAgreementClient{
 	 * @return
 	 */
 	@Override
-	public R passCheck(Long id) {
+	public R agreementPassCheck(Long id) {
 		return agreementService.passCheck(id);
 	}
 
@@ -37,7 +37,7 @@ public class AgreementClient implements IAgreementClient{
 	 * @return
 	 */
 	@Override
-	public R underReview(Long id) {
+	public R agreementUnderReview(Long id) {
 		return agreementService.underReview(id);
 	}
 
@@ -47,7 +47,7 @@ public class AgreementClient implements IAgreementClient{
 	 * @return
 	 */
 	@Override
-	public R passCancel(Long id) {
+	public R agreementPassCancel(Long id) {
 		return agreementService.passCancel(id);
 	}
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/DeclareCustomsServiceImpl.java

@@ -742,7 +742,7 @@ public class DeclareCustomsServiceImpl extends ServiceImpl<DeclareCustomsMapper,
 				if (1 == declareCustomsFees.getFeesType()) {
 					items.setSrcFeesType("收费");
 				} else {
-					items.setSrcFeesType("付费");
+					items.setSrcFeesType("申请");
 				}
 				items.setItemType(itemType);
 				items.setPrice(declareCustomsFees.getPrice());

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -868,7 +868,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 				if (1 == transportItemFees.getFeesType()) {
 					items.setSrcFeesType("收费");
 				} else {
-					items.setSrcFeesType("付费");
+					items.setSrcFeesType("申请");
 				}
 				items.setSrcBoxBillType(transportItemFees.getBillType());
 				items.setItemType(itemType);

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -2223,7 +2223,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 		//审批时间
 		auditProecess.setAuditOpTime(new Date());
 
-		Agreement agreement = agreementClient.getById(proecessTemp.getBillId());
+		Agreement agreement = agreementClient.getByAgreementId(proecessTemp.getBillId());
 
 		//不是最后一级
 		if ("F".equals(iffinalItem)) {
@@ -2232,7 +2232,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			if (operate == 1) {
 				//如果是第一级, 则修改状态为审批中
 				if (auditProecess.getLevelId() == 1) {
-					R submit = agreementClient.underReview(auditProecess.getSrcBillId());
+					R submit = agreementClient.agreementUnderReview(auditProecess.getSrcBillId());
 					if (!submit.isSuccess()) {
 						throw new SecurityException("审批开始修改审核状态失败");
 					}
@@ -2294,7 +2294,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			else if (operate == 2) {
 				auditProecess.setAuditStatus("B");
 				//todo 调用feign取消
-				R r = agreementClient.passCancel(auditProecess.getSrcBillId());
+				R r = agreementClient.agreementPassCancel(auditProecess.getSrcBillId());
 				if (!r.isSuccess()) {
 					throw new SecurityException("修改订单数据失败");
 				}
@@ -2313,7 +2313,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			if (operate == 1) {
 				//todo 调用feign直接通过
 				auditProecess.setAuditStatus("A");
-				R r = agreementClient.passCheck(auditProecess.getSrcBillId());
+				R r = agreementClient.agreementUnderReview(auditProecess.getSrcBillId());
 				if (!r.isSuccess()) {
 					throw new SecurityException("修改订单数据失败");
 				}
@@ -2328,7 +2328,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			else if (operate == 2) {
 				//todo 调用feign取消
 				auditProecess.setAuditStatus("B");
-				R r = agreementClient.passCancel(auditProecess.getSrcBillId());
+				R r = agreementClient.agreementPassCancel(auditProecess.getSrcBillId());
 				if (!r.isSuccess()) {
 					throw new SecurityException("修改订单数据失败");
 				}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/BidingServiceImpl.java

@@ -286,18 +286,22 @@ public class BidingServiceImpl extends ServiceImpl<BidingMapper, Biding> impleme
 		agentList.forEach(e -> {
 			//获得客户
 			CorpsDesc corpsDesc = corpsDescClient.getCorpId(e.getAgentId());
-			//获得客户的所有客户联系人
-			List<CorpsAttn> attnList = corpsAttnClient.getAttn(corpsDesc.getId());
-			attnList.forEach(corpsAttn -> {
-				//获得用户信息
-				R<User> user = userClient.userInfoById(corpsAttn.getUserId());
-				if (ObjectUtil.isNotEmpty(user.getData())){
-					if (ObjectUtil.isNotEmpty(user.getData().getUnionId())){
-						wechatClient.newsPush(user.getData().getUnionId(),
-							salesBiding.getContractNo(), departureHarbor, objectiveHarbor, boxTypeQuantity, loadingTime);
-					}
+			if (ObjectUtil.isNotEmpty(corpsDesc)){
+				//获得客户的所有客户联系人
+				List<CorpsAttn> attnList = corpsAttnClient.getAttn(corpsDesc.getId());
+				if(ObjectUtil.isNotEmpty(attnList)){
+					attnList.forEach(corpsAttn -> {
+						//获得用户信息
+						R<User> user = userClient.userInfoById(corpsAttn.getUserId());
+						if (ObjectUtil.isNotEmpty(user.getData())){
+							if (ObjectUtil.isNotEmpty(user.getData().getUnionId())){
+								wechatClient.newsPush(user.getData().getUnionId(),
+									salesBiding.getContractNo(), departureHarbor, objectiveHarbor, boxTypeQuantity, loadingTime);
+							}
+						}
+					});
 				}
-			});
+			}
 		});
 
 		salesBiding.setStatus(4);

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -2671,7 +2671,12 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	public void paymentApplyBoxTube(List<Items> itemsList, String billType, String belongCompany, String tradeType) {
 		itemsList.forEach(e -> {
 			Acc acc = new Acc();
-			acc.setBillType(billType);
+			if ("064132".equals(AuthUtil.getTenantId())){
+				acc.setBillType(e.getSrcFeesType());
+			}else {
+				acc.setBillType(billType);
+			}
+
 			if ("收费".equals(e.getSrcFeesType())) {
 				acc.setDc("d");
 			} else {