2023年9月28日17:20:28

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

@@ -196,13 +196,24 @@ public class WechatClient implements IWechatClient {
 			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())
-			);
+			if ("792368".equals(wechatMessageTemplate.getTenantId())) {
+				data = Arrays.asList(
+					new WxMpTemplateData("first", title),
+					new WxMpTemplateData("character_string2", device),
+					new WxMpTemplateData("time3", date),
+					new WxMpTemplateData("phrase4", corpName),
+					new WxMpTemplateData("amount5", amount.toString())
+				);
+			} else {
+				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 "";
 		}

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

@@ -25,13 +25,13 @@ import org.springblade.pay.tonglianPayment.utils.SybPayService;
 import org.springblade.pay.tonglianPayment.utils.SybUtil;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderItems;
-import org.springblade.salesPart.feign.IMaintenanceClient;
 import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springblade.purchase.sales.feign.IOrderItemsClient;
-import org.springblade.salesPart.maintenance.entity.Maintenance;
 import org.springblade.salesPart.entity.PjOrder;
 import org.springblade.salesPart.enums.OrderTypeEnum;
+import org.springblade.salesPart.feign.IMaintenanceClient;
 import org.springblade.salesPart.feign.IPJOrderClient;
+import org.springblade.salesPart.maintenance.entity.Maintenance;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.stock.vo.StockGoodsVO;
@@ -605,7 +605,11 @@ public class PaymentServiceImpl implements IPaymentService {
 
 					R<List<PjOrder>> re = ipjOrderClient.getByOrder(order);
 					if (re.isSuccess() && ObjectUtils.isNotNull(re.getData())) {
+						StringBuilder openIds = new StringBuilder();
+						String serialNumber = re.getData().get(0).getSrcOrdNo();
+						BigDecimal amount = new BigDecimal("0.00");
 						for (PjOrder selectOrder : re.getData()) {
+							amount = amount.add(selectOrder.getPaymentAmountTl());
 							selectOrder.setActualPaymentStatus(2);
 							selectOrder.setOldTrxId(AnalysisMapUtils.getString("trxid", params));
 							selectOrder.setPaymentAmountTl(selectOrder.getTotalMoney());
@@ -624,6 +628,9 @@ public class PaymentServiceImpl implements IPaymentService {
 								R<List<User>> userList = userClient.listUserByRoleId(Long.valueOf(clientDeptIds.getData()), parametersDetails.getTenantId(), selectOrder.getSalesCompanyId());
 								if (userList.isSuccess() && CollectionUtils.isNotEmpty(userList.getData())) {
 									for (User datum : userList.getData()) {
+										if (ObjectUtils.isNotNull(datum.getOaOpenId())) {
+											openIds.append(datum.getOaOpenId()).append(",");
+										}
 										//循环发送消息
 										Message sendMessage = new Message();
 										sendMessage.setParameter(selectOrder.getId() + "");
@@ -668,9 +675,17 @@ public class PaymentServiceImpl implements IPaymentService {
 									throw new SecurityException("发送消息失败");
 								}
 							}
-
+							ipjOrderClient.updateOrder(re.getData());
+						}
+						SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+						String date1 = format.format(new Date());
+
+						System.out.println("=========发送人openIds=========" + openIds.substring(0, openIds.length() - 1));
+						if (ObjectUtils.isNotNull(openIds)) {
+							String rest = wechatClient.sendMessage(openIds.substring(0, openIds.length() - 1), "订单通知", "订单通知", date1, re.getData().size() == 0 ? "" : re.getData().get(0).getSalerName(), serialNumber,
+								"", "", "", amount, "2");
+							System.out.println("=========发送返回值=========" + rest);
 						}
-						ipjOrderClient.updateOrder(re.getData());
 						wechatMark.setCause("订单" + AnalysisMapUtils.getString("cusorderid", params) + "支付成功");
 						wechatMark.setStatus(1);
 					} else {
@@ -697,9 +712,11 @@ public class PaymentServiceImpl implements IPaymentService {
 				wechatMarkService.save(wechatMark);
 				throw new RuntimeException("签名验证失败");
 			}
-		} catch (Exception e) {
+		} catch (
+			Exception e) {
 			e.printStackTrace();
 		}
+
 	}
 
 	/**

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsTypeController.java

@@ -91,6 +91,9 @@ public class CorpsTypeController extends BladeController {
 	public R<IPage<CorpsTypeVO>> page(CorpsTypeVO corpsType, Query query) {
 		corpsType.setIsDeleted(0);
 		corpsType.setTenantId(SecureUtil.getTenantId());
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			corpsType.setSalesCompanyId(Long.parseLong(AuthUtil.getDeptId()));
+		}
 		IPage<CorpsTypeVO> pages = corpsTypeService.selectCorpsTypePage(Condition.getPage(query), corpsType);
 		return R.data(pages);
 	}

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

@@ -1264,19 +1264,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	@Transactional(rollbackFor = Exception.class)
 	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R getWeChatPayment(String srcOrderNo) {
-		PjCorpsDesc corpsDesc = null;
-		//根据当前登录人获得客户
-		PjCorpsAttn corpsAttn = corpsAttnService.getAttn(AuthUtil.getUserId());
-		if (ObjectUtil.isNotEmpty(corpsAttn)) {
-			corpsDesc = corpsDescService.getCorpsDesc(corpsAttn.getPid());
-			if (ObjectUtil.isEmpty(corpsDesc)) {
-				throw new RuntimeException("未查到用户信息");
-			}
-		} else {
-			throw new RuntimeException("未查到用户信息");
-		}
-
-		PjCorpsDesc finalCorpsDesc = corpsDesc;
 		List<PjOrder> orderList = baseMapper.selectList(new LambdaQueryWrapper<PjOrder>()
 			.eq(PjOrder::getSrcOrdNo, srcOrderNo)
 			.eq(PjOrder::getActualPaymentStatus, 1)
@@ -1289,7 +1276,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		BigDecimal amount = orderList.stream().map(PjOrder::getTotalMoney).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
 		List<PjOrderItems> pjOrderItems = orderItemsMapper.selectList(new LambdaQueryWrapper<PjOrderItems>().in(PjOrderItems::getPid, ids));
 		String goodsNames = pjOrderItems.stream().map(PjOrderItems::getGoodsName).collect(Collectors.joining());
-		return payService.payPrepay(finalCorpsDesc.getCname(),finalCorpsDesc.getTel(),orderId.substring(0, orderId.length() - 1), amount, srcOrderNo, 1, goodsNames);
+		return payService.payPrepay(orderId.substring(0, orderId.length() - 1), amount, srcOrderNo, 1, goodsNames);
 	}
 
 	/**

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/payMethod/PayService.java

@@ -21,7 +21,7 @@ public interface PayService {
 	 * @param goodsNames   商品名称（多个用逗号拼接）
 	 * @return 支付信息
 	 */
-	R<Map<Object, Object>> payPrepay(String corpName,String tel,String id, BigDecimal amount, String serialNumber, int status, String goodsNames);
+	R<Map<Object, Object>> payPrepay(String id, BigDecimal amount, String serialNumber, int status, String goodsNames);
 
 	/**
 	 * 退款

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/payMethod/PayServiceImpl.java

@@ -69,7 +69,7 @@ public class PayServiceImpl implements PayService {
 	private IUserClient userClient;
 
 	@Override
-	public R<Map<Object, Object>> payPrepay(String corpName,String tel,String id, BigDecimal amount, String serialNumber, int status, String goodsNames) {
+	public R<Map<Object, Object>> payPrepay(String id, BigDecimal amount, String serialNumber, int status, String goodsNames) {
 		if (ObjectUtils.isNull(id)) {
 			throw new RuntimeException("未找到订单信息，订单已取消");
 		}
@@ -142,24 +142,6 @@ public class PayServiceImpl implements PayService {
 			R<Map<Object, Object>> res = paymentClient.payPrepay(paymentDTO);
 			if ("1".equals(count)) {
 				if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
-					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(",");
-									}
-								}
-								wechatClient.sendMessage(openIds.substring(0, openIds.length() - 1), "订单通知", "订单通知", date1, corpName, serialNumber,
-									tel, null, null, amount, "2");
-							}
-						}
-					}
 					return R.data(res.getData());
 				} else {
 					throw new RuntimeException("下单失败");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -300,7 +300,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				}
 				i++;
 			}
-			return payService.payPrepay(finalCorpsDesc.getCname(),finalCorpsDesc.getTel(),ids.substring(0, ids.length() - 1), amount, billNo.getData().toString(), 0, goodsName.substring(0, goodsName.length() - 1));
+			return payService.payPrepay(ids.substring(0, ids.length() - 1), amount, billNo.getData().toString(), 0, goodsName.substring(0, goodsName.length() - 1));
 		} else {
 			throw new RuntimeException("请选择需要结算的商品");
 		}