Merge branch 'master' of http://192.168.1.218:3000/lianghanqiang/ldt

ldt-core/src/main/java/org/springblade/ldt/activity/wrapper/ActivityWrapper.java

@@ -20,10 +20,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.enums.AppConstant;
-import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.common.utils.TenantIgnoreUtil;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.ldt.activity.entity.Activity;
 import org.springblade.ldt.activity.vo.ActivityVO;
 import org.springblade.ldt.mall.entity.Mall;
@@ -43,13 +43,13 @@ import java.util.Objects;
  */
 public class ActivityWrapper extends BaseEntityWrapper<Activity, ActivityVO>  {
 
-	private static IShopService shopService = SpringContextHolder.getBean(IShopService.class);
+	private static IShopService shopService = SpringUtil.getBean(IShopService.class);
 
-	private static IMallService mallService = SpringContextHolder.getBean(IMallService.class);
+	private static IMallService mallService = SpringUtil.getBean(IMallService.class);
 
-	private static IAuditService auditService = SpringContextHolder.getBean(IAuditService.class);
+	private static IAuditService auditService = SpringUtil.getBean(IAuditService.class);
 
-	private static TenantIgnoreUtil tenantIgnoreUtil = SpringContextHolder.getBean(TenantIgnoreUtil.class);
+	private static TenantIgnoreUtil tenantIgnoreUtil = SpringUtil.getBean(TenantIgnoreUtil.class);
 
 	public static ActivityWrapper build() {
 		return new ActivityWrapper();

ldt-core/src/main/java/org/springblade/ldt/agent/wrapper/AgentBillsWrapper.java

@@ -20,10 +20,10 @@ import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.enums.OrderType;
-import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.common.utils.TenantIgnoreUtil;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.ldt.agent.entity.AgentBills;
 import org.springblade.ldt.agent.vo.AgentBillsVO;
 import org.springblade.ldt.mall.entity.Mall;
@@ -50,7 +50,7 @@ public class AgentBillsWrapper extends BaseEntityWrapper<AgentBills, AgentBillsV
 
 	private final IMallService mallService;
 
-	private final static TenantIgnoreUtil tenantIgnoreUtil = SpringContextHolder.getBean(TenantIgnoreUtil.class);
+	private final static TenantIgnoreUtil tenantIgnoreUtil = SpringUtil.getBean(TenantIgnoreUtil.class);
 
 	public static AgentBillsWrapper build(ILoginUserService loginUserService, IShopService shopService, IMallService mallService) {
 		return new AgentBillsWrapper(loginUserService, shopService, mallService);

ldt-core/src/main/java/org/springblade/ldt/agent/wrapper/AgentRecordWrapper.java

@@ -19,10 +19,10 @@ package org.springblade.ldt.agent.wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
-import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.common.utils.TenantIgnoreUtil;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.ldt.agent.entity.AgentRecord;
 import org.springblade.ldt.agent.vo.AgentRecordVO;
 import org.springblade.ldt.shop.entity.Shop;
@@ -40,9 +40,9 @@ import java.util.Objects;
  */
 @AllArgsConstructor
 public class AgentRecordWrapper extends BaseEntityWrapper<AgentRecord, AgentRecordVO> {
-	private static final ILoginUserService loginUserService = SpringContextHolder.getBean(ILoginUserService.class);
-	private static final IShopService shopService = SpringContextHolder.getBean(IShopService.class);
-	private static final TenantIgnoreUtil tenantIgnoreUtil = SpringContextHolder.getBean(TenantIgnoreUtil.class);
+	private static final ILoginUserService loginUserService = SpringUtil.getBean(ILoginUserService.class);
+	private static final IShopService shopService = SpringUtil.getBean(IShopService.class);
+	private static final TenantIgnoreUtil tenantIgnoreUtil = SpringUtil.getBean(TenantIgnoreUtil.class);
 
 	public static AgentRecordWrapper build() {
 		return new AgentRecordWrapper();

ldt-core/src/main/java/org/springblade/ldt/bills/wrapper/BalanceBillsWrapper.java

@@ -20,21 +20,18 @@ import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.enums.OrderType;
-import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.common.utils.TenantIgnoreUtil;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.ldt.bills.entity.BalanceBills;
 import org.springblade.ldt.bills.vo.BalanceBillsVO;
 import org.springblade.ldt.mall.entity.Mall;
 import org.springblade.ldt.mall.service.IMallService;
-import org.springblade.ldt.mall.service.impl.MallServiceImpl;
 import org.springblade.ldt.shop.entity.Shop;
 import org.springblade.ldt.shop.service.IShopService;
-import org.springblade.ldt.shop.service.impl.ShopServiceImpl;
 import org.springblade.ldt.user.entity.LoginUser;
 import org.springblade.ldt.user.service.ILoginUserService;
-import org.springblade.ldt.user.service.impl.LoginUserServiceImpl;
 
 import java.util.Objects;
 
@@ -52,7 +49,7 @@ public class BalanceBillsWrapper extends BaseEntityWrapper<BalanceBills, Balance
 
 	private final IMallService mallService;
 
-	private final static TenantIgnoreUtil tenantIgnoreUtil = SpringContextHolder.getBean(TenantIgnoreUtil.class);
+	private final static TenantIgnoreUtil tenantIgnoreUtil = SpringUtil.getBean(TenantIgnoreUtil.class);
 
 	public static BalanceBillsWrapper build(ILoginUserService loginUserService, IShopService shopService, IMallService mallService) {
 		return new BalanceBillsWrapper(loginUserService,shopService,mallService);

ldt-core/src/main/java/org/springblade/ldt/bills/wrapper/BillsWrapper.java

@@ -20,10 +20,10 @@ import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.enums.OrderType;
-import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.common.utils.TenantIgnoreUtil;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.ldt.bills.entity.Bills;
 import org.springblade.ldt.bills.vo.BillsVO;
 import org.springblade.ldt.mall.entity.Mall;
@@ -49,7 +49,7 @@ public class BillsWrapper extends BaseEntityWrapper<Bills, BillsVO> {
 
 	private final IMallService mallService;
 
-	private final static TenantIgnoreUtil tenantIgnoreUtil = SpringContextHolder.getBean(TenantIgnoreUtil.class);
+	private final static TenantIgnoreUtil tenantIgnoreUtil = SpringUtil.getBean(TenantIgnoreUtil.class);
 
 	public static BillsWrapper build(ILoginUserService loginUserService, IShopService shopService, IMallService mallService) {
 		return new BillsWrapper(loginUserService, shopService, mallService);

ldt-core/src/main/java/org/springblade/ldt/bills/wrapper/PointBillsWrapper.java

@@ -20,10 +20,10 @@ import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.enums.OrderType;
-import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.common.utils.TenantIgnoreUtil;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.ldt.bills.entity.PointBills;
 import org.springblade.ldt.bills.vo.PointBillsVO;
 import org.springblade.ldt.mall.entity.Mall;
@@ -49,7 +49,7 @@ public class PointBillsWrapper extends BaseEntityWrapper<PointBills, PointBillsV
 
 	private final IMallService mallService;
 
-	private final static TenantIgnoreUtil tenantIgnoreUtil = SpringContextHolder.getBean(TenantIgnoreUtil.class);
+	private final static TenantIgnoreUtil tenantIgnoreUtil = SpringUtil.getBean(TenantIgnoreUtil.class);
 
 	public static PointBillsWrapper build(ILoginUserService loginUserService, IShopService shopService, IMallService mallService) {
 		return new PointBillsWrapper(loginUserService,shopService,mallService);

ldt-core/src/main/java/org/springblade/ldt/bills/wrapper/WithdrawRecWrapper.java

@@ -18,20 +18,17 @@ package org.springblade.ldt.bills.wrapper;
 
 import lombok.AllArgsConstructor;
 import org.springblade.common.enums.AppConstant;
-import org.springblade.common.utils.SpringContextHolder;
 import org.springblade.common.utils.TenantIgnoreUtil;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.ldt.bills.entity.WithdrawRec;
 import org.springblade.ldt.bills.vo.WithdrawRecVO;
-import org.springblade.ldt.mall.service.impl.MallServiceImpl;
 import org.springblade.ldt.shop.entity.Shop;
 import org.springblade.ldt.shop.service.IShopService;
-import org.springblade.ldt.shop.service.impl.ShopServiceImpl;
 import org.springblade.ldt.user.entity.LoginUser;
 import org.springblade.ldt.user.service.ILoginUserService;
-import org.springblade.ldt.user.service.impl.LoginUserServiceImpl;
 
 import java.util.Objects;
 
@@ -47,7 +44,7 @@ public class WithdrawRecWrapper extends BaseEntityWrapper<WithdrawRec, WithdrawR
 
 	private final IShopService shopService;
 
-	private final TenantIgnoreUtil tenantIgnoreUtil = SpringContextHolder.getBean(TenantIgnoreUtil.class);
+	private final TenantIgnoreUtil tenantIgnoreUtil = SpringUtil.getBean(TenantIgnoreUtil.class);
 
 	public static WithdrawRecWrapper build(ILoginUserService loginUserService, IShopService shopService) {
 		return new WithdrawRecWrapper(loginUserService,shopService);

ldt-core/src/main/java/org/springblade/wx/constant/MessageTemplate.java

@@ -36,12 +36,14 @@ public enum MessageTemplate {
 	String contentString;
 
 	public String buildRequestBody(String openId, JSONObject content, String page){
-		HashMap<String, Object> params = new HashMap<>();
+		HashMap<String, Object> params = new HashMap<>(3);
 		params.put("touser",openId);
-		params.put("template_id",templateId);
-		params.put("miniprogram_state","developer");
-		params.put("data",content);
-		params.put("page",page);
+//		params.put("miniprogram_state","developer");
+		HashMap<String, Object> weappTemplateMsg = new HashMap<>(3);
+		weappTemplateMsg.put("template_id",templateId);
+		weappTemplateMsg.put("data",content);
+		weappTemplateMsg.put("page",page);
+		params.put("weapp_template_msg",weappTemplateMsg);
 		return JSON.toJSONString(params);
 	}
 

ldt-core/src/main/java/org/springblade/wx/service/WeChatService.java

@@ -5,6 +5,7 @@ import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.http.protocol.HTTP;
 import org.springblade.common.cache.WechatCache;
 import org.springblade.core.log.exception.ServiceException;
@@ -32,6 +33,7 @@ import java.util.Objects;
  * @since: 9/6/21 -- 8:09 PM
  */
 @Service
+@Slf4j
 public class WeChatService {
 
 	@Autowired
@@ -46,9 +48,11 @@ public class WeChatService {
 		Assert.notNull(messageTemplate,()->{ throw new ServiceException("找不到响应的消息模板"); });
 		String token = fetchAccessToken(miniProgramType);
 		String query = "?access_token="+token;
-		return  HttpRequest.post(WeChatApi.sendTemplateMessage.getApi()+query)
+		HttpResponse execute = HttpRequest.post(WeChatApi.sendTemplateMessage.getApi() + query)
 			.body(messageTemplate.buildRequestBody(openId, content, page))
 			.execute();
+		log.info("微信发送消息模板响应:{}",execute.body());
+		return  execute;
 	}
 
 	/**