Explorar el Código

微信移动端支付

guomengjiao hace 5 meses
padre
commit
9d2ed88cf9

+ 0 - 11
modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelRelevancyService.java

@@ -17,20 +17,9 @@ import com.jeesite.modules.report.dao.ResearchBriefReportLabelRelevancyDao;
 @Service
 public class ResearchBriefReportLabelRelevancyService extends CrudService<ResearchBriefReportLabelRelevancyDao, ResearchBriefReportLabelRelevancy> {
 	
-	/**
-	 * 获取单条数据
-	 * @param researchBriefReportLabelRelevancy
-	 * @return
-	 */
-	@Override
-	public ResearchBriefReportLabelRelevancy get(ResearchBriefReportLabelRelevancy researchBriefReportLabelRelevancy) {
-		return super.get(researchBriefReportLabelRelevancy);
-	}
-	
 	/**
 	 * 查询分页数据
 	 * @param researchBriefReportLabelRelevancy 查询条件
-	 * @param researchBriefReportLabelRelevancy.page 分页对象
 	 * @return
 	 */
 	@Override

+ 0 - 11
modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelService.java

@@ -18,20 +18,9 @@ import java.util.stream.Collectors;
 @Service
 public class ResearchBriefReportLabelService extends CrudService<ResearchBriefReportLabelDao, ResearchBriefReportLabel> {
 	
-	/**
-	 * 获取单条数据
-	 * @param researchBriefReportLabel
-	 * @return
-	 */
-	@Override
-	public ResearchBriefReportLabel get(ResearchBriefReportLabel researchBriefReportLabel) {
-		return convert(super.get(researchBriefReportLabel));
-	}
-	
 	/**
 	 * 查询分页数据
 	 * @param researchBriefReportLabel 查询条件
-	 * @param researchBriefReportLabel.page 分页对象
 	 * @return
 	 */
 	@Override

+ 0 - 9
modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java

@@ -44,15 +44,6 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 	@Resource
 	private ResearchBriefReportLabelRelevancyDao researchBriefReportLabelRelevancyDao;
 
-	/**
-	 * 获取单条数据
-	 * @param researchBriefReport
-	 * @return
-	 */
-	@Override
-	public ResearchBriefReport get(ResearchBriefReport researchBriefReport) {
-		return convert(super.get(researchBriefReport));
-	}
 	
 	/**
 	 * 查询分页数据

+ 0 - 10
modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderDownService.java

@@ -17,16 +17,6 @@ import java.util.List;
 @Service
 public class WebsiteUserOrderDownService extends CrudService<WebsiteUserOrderDownDao, WebsiteUserOrderDown> {
 	
-	/**
-	 * 获取单条数据
-	 * @param websiteUserOrderDown
-	 * @return
-	 */
-	@Override
-	public WebsiteUserOrderDown get(WebsiteUserOrderDown websiteUserOrderDown) {
-		return super.get(websiteUserOrderDown);
-	}
-	
 	/**
 	 * 查询分页数据
 	 * @param websiteUserOrderDown 查询条件

+ 2 - 11
modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java

@@ -52,16 +52,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 	private NotificationParser notificationParser;
 
 	private static Logger logger = LoggerFactory.getLogger(WebsiteUserOrderService.class);
-	/**
-	 * 获取单条数据
-	 * @param websiteUserOrder
-	 * @return
-	 */
-	@Override
-	public WebsiteUserOrder get(WebsiteUserOrder websiteUserOrder) {
-		return convert(super.get(websiteUserOrder));
-	}
-	
+
 	/**
 	 * 查询分页数据
 	 * @param websiteUserOrder 查询条件
@@ -316,7 +307,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 	}
 
 	public WebsiteUserOrder getOne(WebsiteUserOrder orderWhere) {
-		return super.get(orderWhere);
+		return dao.getByEntity(orderWhere);
 	}
 
 

+ 0 - 11
modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserService.java

@@ -17,20 +17,9 @@ import java.util.List;
 @Service
 public class WebsiteUserService extends CrudService<WebsiteUserDao, WebsiteUser> {
 	
-	/**
-	 * 获取单条数据
-	 * @param websiteUser
-	 * @return
-	 */
-	@Override
-	public WebsiteUser get(WebsiteUser websiteUser) {
-		return super.get(websiteUser);
-	}
-	
 	/**
 	 * 查询分页数据
 	 * @param websiteUser 查询条件
-	 * @param websiteUser.page 分页对象
 	 * @return
 	 */
 	@Override

+ 1 - 1
web/src/main/resources/config/application.yml

@@ -936,7 +936,7 @@ alipay:
   # 服务器异步通知页面路径
   notify_url: http://frp.songlanyun.com:8801/js/a/api/report/websiteUserOrder/pay/asyncNotify
   # 页面跳转同步通知页面路径
-#  return_url: http://jackchen.imwork.net:27687/pay/syncNotify
+  return_url: http://frp.songlanyun.com:8801/
   # 签名方式
   sign_type: RSA2
   # 字符编码格式