2023年9月1日11:43:16

blade-service/blade-client/src/main/java/org/springblade/client/equipment/service/impl/CorpEquipmentArchivesServiceImpl.java

@@ -135,7 +135,7 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 			if (corpEquipmentArchives.getCorpEquipmentArchivesItemList().size() != code.size()) {
 				throw new RuntimeException("设备明细重复,保存失败");
 			}
-			String json = corpEquipmentArchives.getCorpEquipmentArchivesItemList().stream().map(CorpEquipmentArchivesItem::getCname).collect(Collectors.joining(","));
+			String json = corpEquipmentArchives.getCorpEquipmentArchivesItemList().stream().map(CorpEquipmentArchivesItem::getEquipmentDescribe).collect(Collectors.joining(","));
 			corpEquipmentArchives.setDeviceJson(json);
 			baseMapper.updateById(corpEquipmentArchives);
 			for (CorpEquipmentArchivesItem item : corpEquipmentArchives.getCorpEquipmentArchivesItemList()) {

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

@@ -170,22 +170,65 @@ public class WechatClient implements IWechatClient {
 		if (ObjectUtils.isNull(telW)) {
 			telW = "-";
 		}
-		List<WxMpTemplateData> data = Arrays.asList(
-			new WxMpTemplateData("first", title),
-			new WxMpTemplateData("thing2", name + "/" + tel),
-			new WxMpTemplateData("thing4", projectName),
-			new WxMpTemplateData("time8", date),
-			new WxMpTemplateData("phone_number7", telW)
-		);
+		List<WxMpTemplateData> data = null;
+		if ("1".equals(type)) {
+			data = Arrays.asList(
+				new WxMpTemplateData("first", title),
+				new WxMpTemplateData("thing2", name + "/" + tel),
+				new WxMpTemplateData("thing4", projectName),
+				new WxMpTemplateData("time8", date),
+				new WxMpTemplateData("phone_number7", telW)
+			);
+		} else if ("2".equals(type)) {
+			String corpName = "";
+			if (ObjectUtils.isNotNull(name) && name.length() > 8) {
+				corpName = name.substring(0, 8);
+			} else {
+				if (ObjectUtils.isNull(name)) {
+					corpName = "无";
+				} else {
+					corpName = name;
+				}
+			}
+			if (ObjectUtils.isNull(amount)) {
+				amount = new BigDecimal("0.00");
+			}
+			if (ObjectUtils.isNull(device)) {
+				device = "-";
+			}
+			data = Arrays.asList(
+				new WxMpTemplateData("first", title),
+				new WxMpTemplateData("character_string2", device),
+				new WxMpTemplateData("time3", date),
+				new WxMpTemplateData("phrase4", tel + "/" + corpName),
+				new WxMpTemplateData("amount5", amount.toString())
+			);
+		} else {
+			return "";
+		}
+
 		String[] arrs = openid.split(",");
 		for (String item : arrs) {
-			//2,推送消息
-			WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
-				.toUser(item)//要推送的用户openid
-				.templateId(wechatMessageTemplate.getTemplateId())//模版id
-				.miniProgram(new WxMpTemplateMessage.MiniProgram(wechatMessageTemplate.getAppId(), "pages/index"))
-				.data(data)
-				.build();
+			WxMpTemplateMessage templateMessage = null;
+			if ("1".equals(type)) {
+				//2,推送消息
+				templateMessage = WxMpTemplateMessage.builder()
+					.toUser(item)//要推送的用户openid
+					.templateId(wechatMessageTemplate.getTemplateId())//模版id
+					.miniProgram(new WxMpTemplateMessage.MiniProgram(wechatMessageTemplate.getAppId(), "pages/index"))
+					.data(data)
+					.build();
+			} else if ("2".equals(type)) {
+				//2,推送消息
+				templateMessage = WxMpTemplateMessage.builder()
+					.toUser(item)//要推送的用户openid
+					.templateId(wechatMessageTemplate.getTemplateId())//模版id
+					.miniProgram(new WxMpTemplateMessage.MiniProgram(wechatMessageTemplate.getAppId(), "pages/index"))
+					.data(data)
+					.build();
+			} else {
+				break;
+			}
 			try {
 				wxMpService.getTemplateMsgService().sendTemplateMsg(templateMessage);
 			} catch (Exception e) {

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

@@ -185,6 +185,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	private IIntegralDetailService integralDetailService;
 
+	private final IWechatClient wechatClient;
+
 
 	@Override
 	public IPage<OrderVO> selectOrderPage(IPage<OrderVO> page, OrderVO order) {
@@ -4674,6 +4676,26 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 		}
+		if ("504978".equals(AuthUtil.getTenantId())) {
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+			String date1 = format.format(new Date());
+			StringBuilder openIds = new StringBuilder();
+			List<CorpsAttn> corpsAttnList = corpsAttnClient.getAttn(order.getCorpId());
+			StringBuilder userIds = new StringBuilder();
+			for (CorpsAttn item : corpsAttnList) {
+				if (ObjectUtils.isNotNull(item.getUserId())) {
+					userIds.append(item.getUserId()).append(",");
+				}
+			}
+			List<User> res1 = userClient.selectUserIds(userIds.toString());
+			for (User item : res1) {
+				if (ObjectUtils.isNotNull(item.getOaOpenId())) {
+					openIds.append(item.getOaOpenId()).append(",");
+				}
+			}
+			wechatClient.sendMessage(openIds.substring(0, openIds.length() - 1), "订单通知", "订单通知", date1, order.getCorpsName(), order.getSysNo(),
+				order.getSalesName(), null, null, order.getBalanceAmount(), "2");
+		}
 		return R.data(order);
 	}
 
@@ -6432,6 +6454,27 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 		}
+
+		if ("504978".equals(AuthUtil.getTenantId())) {
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+			String date1 = format.format(new Date());
+			StringBuilder openIds = new StringBuilder();
+			List<CorpsAttn> corpsAttnList = corpsAttnClient.getAttn(order.getCorpId());
+			StringBuilder userIds = new StringBuilder();
+			for (CorpsAttn item : corpsAttnList) {
+				if (ObjectUtils.isNotNull(item.getUserId())) {
+					userIds.append(item.getUserId()).append(",");
+				}
+			}
+			List<User> res1 = userClient.selectUserIds(userIds.toString());
+			for (User item : res1) {
+				if (ObjectUtils.isNotNull(item.getOaOpenId())) {
+					openIds.append(item.getOaOpenId()).append(",");
+				}
+			}
+			wechatClient.sendMessage(openIds.substring(0, openIds.length() - 1), "订单通知", "订单通知", date1, order.getCorpsName(), order.getSysNo(),
+				order.getSalesName(), null, null, order.getBalanceAmount(), "2");
+		}
 		//通联支付下单处理
 		R r = this.payPrepay(order);
 		if (!r.isSuccess() || r.getCode() != 200) {
@@ -7661,6 +7704,37 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			}
 		}
+		if ("504978".equals(AuthUtil.getTenantId())) {
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+			String date1 = format.format(new Date());
+			R<String> clientDeptIds = sysClient.getRoleIds(SecureUtil.getTenantId(), "管理员");
+			if (clientDeptIds.isSuccess() && StringUtils.isNotBlank(clientDeptIds.getData())) {
+				R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), null, null);
+				if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
+					StringBuilder openIds = new StringBuilder();
+					for (User datum : userList.getData()) {
+						if (ObjectUtils.isNotNull(datum.getOaOpenId())) {
+							openIds.append(datum.getOaOpenId()).append(",");
+						}
+					}
+					if (",".equals(openIds.toString())) {
+
+					} else {
+						if (ObjectUtils.isNotNull(order.getSalesName())) {
+							R<User> res = userClient.userInfoById(Long.parseLong(order.getSalesName()));
+							if (res.isSuccess() && res.getData() != null) {
+								if (ObjectUtils.isNotNull(res.getData().getOaOpenId())) {
+									openIds.append(res.getData().getOaOpenId()).append(",");
+								}
+							}
+						}
+						wechatClient.sendMessage(openIds.substring(0, openIds.length() - 1), "订单通知", "订单通知", date1, order.getCorpsName(), order.getSysNo(),
+							order.getSalesName(), null, null, order.getBalanceAmount(), "2");
+
+					}
+				}
+			}
+		}
 		return R.data(order);
 	}
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/brand/controller/BrandDescController.java

@@ -232,4 +232,21 @@ public class BrandDescController extends BladeController {
 		}
 		return R.data(list);
 	}
+
+	/**
+	 * 品牌下拉
+	 */
+	@GetMapping("/listAllV1")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "品牌下拉", notes = "传入brandDesc")
+	public R<List<PjBrandDesc>> listAllV1(PjBrandDesc brandDesc) {
+		LambdaQueryWrapper<PjBrandDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PjBrandDesc::getTenantId, AuthUtil.getTenantId())
+			.eq(PjBrandDesc::getIsDeleted, 0)
+			.eq(PjBrandDesc::getType, brandDesc.getType())
+			.like(ObjectUtils.isNotEmpty(brandDesc.getCname()), PjBrandDesc::getCname, brandDesc.getCname())
+			.orderByDesc(PjBrandDesc::getSort);
+		List<PjBrandDesc> list = brandDescService.list(lambdaQueryWrapper);
+		return R.data(list);
+	}
 }

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

@@ -311,8 +311,34 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 		if (maintenance.getId() == null) {
 			throw new RuntimeException("缺少必要参数");
 		}
-		Long maintenanceWorkerId = maintenance.getMaintenanceWorkerId();
 		if (maintenance.getStatus() <= 3) {
+			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+			String date = format.format(new Date());
+			StringBuilder openIds = new StringBuilder();
+			R<User> res = userClient.userInfoById(maintenance.getMaintenanceWorkerId());
+			List<CorpsAttn> corpsAttnList = corpsAttnClient.getAttn(maintenance.getCorpId());
+			StringBuilder userIds = new StringBuilder();
+			for (CorpsAttn item : corpsAttnList) {
+				if (ObjectUtils.isNotNull(item.getUserId())) {
+					userIds.append(item.getUserId()).append(",");
+				}
+			}
+			List<User> res1 = userClient.selectUserIds(userIds.toString());
+			for (User item : res1) {
+				if (ObjectUtils.isNotNull(item.getOaOpenId())) {
+					openIds.append(item.getOaOpenId()).append(",");
+				}
+			}
+			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+				if (",".equals(openIds.toString())) {
+					openIds = new StringBuilder(res.getData().getOaOpenId());
+				} else {
+					openIds.append(res.getData().getOaOpenId());
+				}
+			}
+			wechatClient.sendMessage(openIds.toString(), "派工通知", "设备维修-撤销派工", date, maintenance.getCorpName(), maintenance.getDeviceName(),
+				maintenance.getCorpTel(), maintenance.getMaintenanceWorkerTel(), maintenance.getDeviceDescribe(), maintenance.getMaintenanceAmount(), "1");
+
 			maintenance.setDispatchingWorkers("1");
 			maintenance.setStatus(1);
 			maintenance.setUpdateTime(new Date());
@@ -352,32 +378,6 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 		maintenanceLog.setCreateUserName(AuthUtil.getUserName());
 		maintenanceLog.setType("已撤销");
 		maintenanceLogService.save(maintenanceLog);
-		SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-		String date = format.format(new Date());
-		StringBuilder openIds = new StringBuilder();
-		R<User> res = userClient.userInfoById(maintenanceWorkerId);
-		List<CorpsAttn> corpsAttnList = corpsAttnClient.getAttn(maintenance.getCorpId());
-		StringBuilder userIds = new StringBuilder();
-		for (CorpsAttn item : corpsAttnList) {
-			if (ObjectUtils.isNotNull(item.getUserId())) {
-				userIds.append(item.getUserId()).append(",");
-			}
-		}
-		List<User> res1 = userClient.selectUserIds(userIds.toString());
-		for (User item : res1) {
-			if (ObjectUtils.isNotNull(item.getOaOpenId())) {
-				openIds.append(item.getOaOpenId()).append(",");
-			}
-		}
-		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
-			if (",".equals(openIds.toString())) {
-				openIds = new StringBuilder(res.getData().getOaOpenId());
-			} else {
-				openIds.append(res.getData().getOaOpenId());
-			}
-		}
-		wechatClient.sendMessage(openIds.toString(), "派工通知", "设备维修-撤销派工", date, maintenance.getCorpName(), maintenance.getDeviceName(),
-			maintenance.getCorpTel(), maintenance.getMaintenanceWorkerTel(), maintenance.getDeviceDescribe(), maintenance.getMaintenanceAmount(), "1");
 
 		return R.data(maintenance);
 	}