2022年11月14 19:16

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IWechatClient.java

@@ -26,7 +26,7 @@ public interface IWechatClient {
 	@GetMapping(API_NEW_PUSH)
 	String newsPush(@RequestParam("unionId") String unionId,
 					@RequestParam("contractNo") String contractNo,
-					@RequestParam("keyword3") String keyword3,
-					@RequestParam("keyword4") String keyword4,
-					@RequestParam("keyword5") String  keyword5);
+					@RequestParam("harbor") String harbor,
+					@RequestParam("cargoInformation") String cargoInformation,
+					@RequestParam("loadingTime") String  loadingTime);
 }

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -91,7 +91,7 @@ public class Delivery implements Serializable {
 	/**
 	 * 发货日期
 	 */
-	@ApiModelProperty(value = "发货日期")
+	@ApiModelProperty(value = "发货完成日期")
 	private Date businessDate;
 	/**
 	 * 客户id(全称)

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/FactoryDelivery.java

@@ -39,7 +39,7 @@ public class FactoryDelivery {
 	/**
 	 * 发货日期
 	 */
-	@ExcelProperty("发货日期")
+	@ExcelProperty("发货完成日期")
 	private Date businessDate;
 	/**
 	 * 入库数量

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/excel/SaleDeliveryExcel.java

@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -35,7 +36,7 @@ public class SaleDeliveryExcel {
 	 * 所属公司
 	 */
 	@ExcelProperty(value = "所属公司")
-	private String salesCompany;
+	private String salesCompanyName;
 
 	/**
 	 * 出库日期
@@ -47,7 +48,7 @@ public class SaleDeliveryExcel {
 	 * 出库数量
 	 */
 	@ExcelProperty(value = "出库数量")
-	private String totalQuantity;
+	private BigDecimal freightQuantity;
 
 	/**
 	 * 制单人

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

@@ -973,7 +973,9 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 				this.agencyOrderProcess(e);
 			} else if ("ocg".equals(e.getCheckType()) || "oly".equals(e.getCheckType())) {
 				this.officeCheck(e);
-			} else {
+			} else if ("bsdd".equals(e.getCheckType())){
+				this.bidingCheck(e);
+			}else {
 				this.commonCheck(e);
 			}
 		});

blade-service/blade-client/src/main/java/org/springblade/client/wechat/feign/WechatClient.java

@@ -44,7 +44,7 @@ public class WechatClient implements IWechatClient {
 	 * @return 结果
 	 */
 	@Override
-	public String newsPush(String unionId, String contractNo, String keyword3, String keyword4, String keyword5) {
+	public String newsPush(String unionId, String contractNo, String harbor, String cargoInformation, String loadingTime) {
 		//获得token
 		Map<String,String> tokenMap = this.getToken();
 		//获得用户列表
@@ -67,9 +67,9 @@ public class WechatClient implements IWechatClient {
 					new WxMpTemplateData("first", "[提醒]您有新的竞价消息,请尽快报价,过期作废"),
 					new WxMpTemplateData("keyword1", "发布"),
 					new WxMpTemplateData("keyword2", contractNo),
-					new WxMpTemplateData("keyword3", keyword3),
-					new WxMpTemplateData("keyword4", keyword4),
-					new WxMpTemplateData("keyword5", keyword5),
+					new WxMpTemplateData("keyword3", harbor),
+					new WxMpTemplateData("keyword4", cargoInformation),
+					new WxMpTemplateData("keyword5", loadingTime),
 					new WxMpTemplateData("remark", "感谢您的使用。")
 				);
 				//2,推送消息
@@ -100,7 +100,6 @@ public class WechatClient implements IWechatClient {
 		try {
 			String response = HttpUtil.get(requestUrl);
 			JSONObject jsonObject = JSONObject.parseObject(response);
-			log.info("token======>"+jsonObject);
 			if (ObjectUtil.isEmpty(jsonObject.get("errcode"))){
 				String accessToken = String.valueOf(jsonObject.get("access_token"));
 				if (ObjectUtil.isEmpty(accessToken)){

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/receiving/ReCeVingController.java

@@ -288,7 +288,7 @@ public class ReCeVingController extends BladeController {
 				list.add(factoryDelivery);
 			});
 		}
-		ExcelUtil.export(response, "导出工厂发货信息", "导出数据表", list, FactoryDelivery.class);
+		ExcelUtil.export(response, "工厂发货信息", "导出数据表", list, FactoryDelivery.class);
 	}
 
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/BidingMapper.xml

@@ -48,7 +48,8 @@
             BB.box_type_quantity AS boxTypeQuantity,
             BB.status AS status,
             BBA.status AS agentStatus,
-            BCD.id as corpId
+            BCD.id as corpId,
+            BB.remark as remark
         FROM business_biding BB
         LEFT JOIN business_biding_agent BBA ON BBA.pid = BB.id
         LEFT JOIN basic_corps_desc BCD ON BCD.id = BBA.agent_id

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

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.seata.common.util.CollectionUtils;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsAttn;
+import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsAttnClient;
 import org.springblade.client.feign.ICorpsDescClient;
+import org.springblade.client.feign.IWechatClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.purchase.sales.entity.Biding;
@@ -18,6 +21,8 @@ import org.springblade.purchase.sales.mapper.BidingAgentMapper;
 import org.springblade.purchase.sales.mapper.BidingItemsMapper;
 import org.springblade.purchase.sales.mapper.BidingMapper;
 import org.springblade.purchase.sales.service.IBidingItemsService;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -36,7 +41,10 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 
 	private final BidingMapper bidingMapper;
 	private final BidingAgentMapper bidingAgentMapper;
-	private final ICorpsAttnClient corpsAttnClient;
+	private final ICorpsAttnClient corpsAttnClient;//客户联系人
+	private final ICorpsDescClient corpsDescClient;//获取客户信息
+	private final IUserClient userClient;//获得用户信息
+	private final IWechatClient wechatClient;//微信
 
 	/**
 	 * 保存订单明细信息
@@ -120,6 +128,20 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 			.eq(BidingItems::getDistinguish, distinguish)
 			.eq(BidingItems::getIsDeleted, 0)
 			.eq(BidingItems::getTenantId, AuthUtil.getTenantId()));
+
+		if (distinguish.equals(1)){
+			if (ObjectUtil.isNotEmpty(list)){
+				list.forEach(e -> {
+					if (ObjectUtil.isNotEmpty(e.getCorpsAttnId())){
+						R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(e.getCorpsAttnId());
+						if (corpMessage.isSuccess() && corpMessage.getData() != null){
+							e.setContrastName(corpMessage.getData().getCname());
+						}
+					}
+				});
+
+			}
+		}
 		return list;
 	}
 
@@ -190,6 +212,23 @@ public class BidingItemsServiceImpl extends ServiceImpl<BidingItemsMapper, Bidin
 		BidingAgent bidingAgent = bidingAgentMapper.selectOne(lambdaQueryWrapper);
 
 		if (ObjectUtil.isNotEmpty(bidingAgent)){
+			//根据代理客户的客户联系人进行消息推送
+			//获得所有代理客户
+
+			/*CorpsDesc corpsDesc = corpsDescClient.getCorpId(bidingAgent.getAgentId());
+			//获得客户的所有客户联系人
+			List<CorpsAttn> attnList = corpsAttnClient.getAttn(corpsDesc.getId());
+			attnList.forEach(corpsAttn -> {
+				//获得用户信息
+				R<User> user = userClient.userInfoById(corpsAttn.getUserId());
+				if (ObjectUtil.isNotEmpty(user)){
+					if (ObjectUtil.isNotEmpty(user.getData().getUnionId())){
+						*//*String msg = wechatClient.newsPush(user.getData().getUnionId(),
+							salesBiding.getContractNo(), harbor, salesBiding.getCargoInformation(),loadingTime);*//*
+					}
+				}
+			});*/
+
 			//更新代理明细信息
 			bidingAgent.setStatus(6);
 			bidingAgentMapper.updateById(bidingAgent);

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

@@ -269,7 +269,9 @@ public class BidingServiceImpl extends ServiceImpl<BidingMapper, Biding> impleme
 		}
 
 		DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+		//路线
 		String harbor = salesBiding.getDepartureHarbor() + "至" + salesBiding.getObjectiveHarbor();
+		//装柜时间
 		String loadingTime = dateFormat.format(salesBiding.getLoadingTime());
 
 		//根据代理客户的客户联系人进行消息推送
@@ -283,9 +285,9 @@ public class BidingServiceImpl extends ServiceImpl<BidingMapper, Biding> impleme
 			attnList.forEach(corpsAttn -> {
 				//获得用户信息
 				R<User> user = userClient.userInfoById(corpsAttn.getUserId());
-				if (ObjectUtil.isNotEmpty(user)){
+				if (ObjectUtil.isNotEmpty(user.getData())){
 					if (ObjectUtil.isNotEmpty(user.getData().getUnionId())){
-						String msg = wechatClient.newsPush(user.getData().getUnionId(),
+						wechatClient.newsPush(user.getData().getUnionId(),
 							salesBiding.getContractNo(), harbor, salesBiding.getCargoInformation(),loadingTime);
 					}
 				}

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -244,9 +244,9 @@ public class SettlementController extends BladeController {
 
 		List<ExpenseExcel> excelList = BeanUtil.copy(list, ExpenseExcel.class);
 		if(settlement.getBillType().equals("付费")){
-			ExcelUtil.export(response, "付费结算", "付费结算", excelList, ExpenseExcel.class);
+			ExcelUtil.export(response, "付款结算", "付费结算", excelList, ExpenseExcel.class);
 		}else if (settlement.getBillType().equals("收费")){
-			ExcelUtil.export(response, "收费结算", "收费结算", excelList, ExpenseExcel.class);
+			ExcelUtil.export(response, "收款结算", "收费结算", excelList, ExpenseExcel.class);
 		}
 	}
 

blade-service/trade-finance/src/main/java/org/springblade/finance/excel/ExpenseExcel.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -42,7 +43,7 @@ public class ExpenseExcel implements Serializable {
 	 * 人民币金额
 	 */
 	@ExcelProperty(value = "人民币金额")
-	private String amount;
+	private BigDecimal amount;
 
 	/**
 	 * 结算日期