2023年10月24日18:49:13

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/service/impl/PaymentServiceImpl.java

@@ -547,7 +547,7 @@ public class PaymentServiceImpl implements IPaymentService {
 										if (ObjectUtils.isNotNull(result)) {
 											data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 										} else {
-											data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+											data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 										}
 									} catch (Exception e) {
 										e.printStackTrace();
@@ -738,7 +738,7 @@ public class PaymentServiceImpl implements IPaymentService {
 										if (ObjectUtils.isNotNull(result)) {
 											data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 										} else {
-											data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+											data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 										}
 									} catch (Exception e) {
 										e.printStackTrace();

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

@@ -4760,7 +4760,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						if (ObjectUtils.isNotNull(result)) {
 							data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 						} else {
-							data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+							data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 						}
 					} catch (Exception e) {
 						e.printStackTrace();
@@ -6572,7 +6572,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 						if (ObjectUtils.isNotNull(result)) {
 							data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 						} else {
-							data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+							data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 						}
 					} catch (Exception e) {
 						e.printStackTrace();
@@ -7861,7 +7861,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 									if (ObjectUtils.isNotNull(result)) {
 										data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 									} else {
-										data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+										data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 									}
 								} catch (Exception e) {
 									e.printStackTrace();

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -196,7 +196,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 									if (ObjectUtils.isNotNull(result)) {
 										data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 									} else {
-										data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+										data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 									}
 								} catch (Exception e) {
 									e.printStackTrace();
@@ -353,7 +353,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 					if (ObjectUtils.isNotNull(result)) {
 						data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 					} else {
-						data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+						data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 					}
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -426,7 +426,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 						if (ObjectUtils.isNotNull(result)) {
 							data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 						} else {
-							data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+							data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 						}
 					} catch (Exception e) {
 						e.printStackTrace();
@@ -781,7 +781,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 						if (ObjectUtils.isNotNull(result)) {
 							data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 						} else {
-							data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+							data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 						}
 					} catch (Exception e) {
 						e.printStackTrace();
@@ -966,7 +966,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 						if (ObjectUtils.isNotNull(result)) {
 							data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 						} else {
-							data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+							data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 						}
 					} catch (Exception e) {
 						e.printStackTrace();

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -750,7 +750,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 								if (ObjectUtils.isNotNull(result)) {
 									data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 								} else {
-									data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+									data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 								}
 							} catch (Exception e) {
 								e.printStackTrace();
@@ -758,7 +758,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						}
 						if (data.size() > 0) {
 							WxMpTemplateDto wxMpTemplateDto = new WxMpTemplateDto();
-							wxMpTemplateDto.setOpenid(openIds.substring(0, openIds.length() - 1));
+							wxMpTemplateDto.setOpenid(openIds.toString());
 							wxMpTemplateDto.setTenantId(AuthUtil.getTenantId());
 							wxMpTemplateDto.setType("3");
 							wxMpTemplateDto.setData(data);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -416,6 +416,8 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 					gdShip.setDate(date1);
 					if (goodsNames.length() > 8) {
 						gdShip.setGoodsNames(goodsNames.substring(0, 8));
+					}else{
+						gdShip.setGoodsNames(goodsNames.toString());
 					}
 					if (gdShip.getCustomerName().length() > 8) {
 						gdShip.setCustomerName(gdShip.getCustomerName().substring(0, 8));
@@ -431,7 +433,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 							if (ObjectUtils.isNotNull(result)) {
 								data.add(new WxMpTemplateData(item.getDataValue(), result.toString()));
 							} else {
-								data.add(new WxMpTemplateData(item.getDataValue(), "-"));
+								data.add(new WxMpTemplateData(item.getDataValue(), "无"));
 							}
 						} catch (Exception e) {
 							e.printStackTrace();

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

@@ -379,7 +379,7 @@ public class WechatClient implements IWechatClient {
 		wxMpService.setWxMpConfigStorage(wxStorage);
 		String[] arrs = wxMpTemplateDto.getOpenid().split(",");
 		System.out.println("======推送openids==========" + wxMpTemplateDto.getOpenid());
-		System.out.println("======推送数据==========" + wxMpTemplateDto.getOpenid());
+		System.out.println("======推送数据==========" + wxMpTemplateDto.getData().toString());
 		System.out.println("======推送arrs==========" + arrs.length);
 		for (String item : arrs) {
 			//2,推送消息