微信移动端支付

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportLabelService.java

@@ -49,7 +49,7 @@ public class ResearchBriefReportLabelService extends CrudService<ResearchBriefRe
 	private ResearchBriefReportLabel convert(ResearchBriefReportLabel r) {
 		ResearchBriefReportLabel where = new ResearchBriefReportLabel();
 		where.setId(r.getParentId());
-		ResearchBriefReportLabel label = dao.get(where);
+		ResearchBriefReportLabel label = dao.getByEntity(where);
 		if (label != null) {
 			r.setParentName(label.getName());
 		}

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java

@@ -173,7 +173,7 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 	}
 
 	public ResearchBriefReport researchBriefReportForm(ResearchBriefReport researchBriefReport, HttpServletRequest request) {
-		ResearchBriefReport old = dao.get(researchBriefReport);
+		ResearchBriefReport old = dao.getByEntity(researchBriefReport);
 		if (old == null) {
 			return old;
 		}

modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderDownService.java

@@ -54,7 +54,7 @@ public class WebsiteUserOrderDownService extends CrudService<WebsiteUserOrderDow
 	@Override
 	@Transactional
 	public void save(WebsiteUserOrderDown websiteUserOrderDown) {
-		WebsiteUserOrderDown oldDown = dao.get(websiteUserOrderDown);
+		WebsiteUserOrderDown oldDown = dao.getByEntity(websiteUserOrderDown);
 		if (oldDown == null) {
 			websiteUserOrderDown.setDownNum(1);
 			super.save(websiteUserOrderDown);

modules/report/src/main/java/com/jeesite/modules/report/service/WebsiteUserOrderService.java

@@ -214,7 +214,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 		WebsiteUserOrder where = new WebsiteUserOrder();
 		where.setOrderNumber(out_trade_no);
 		where.setPayStatus(Constants.orderPayStatus.WAIT);
-		WebsiteUserOrder websiteUserOrder = dao.get(where);
+		WebsiteUserOrder websiteUserOrder = dao.getByEntity(where);
 		if (websiteUserOrder == null) {
 			logger.error("payAsyncNotify error {}订单不存在未支付", out_trade_no);
 		} else {
@@ -241,7 +241,7 @@ public class WebsiteUserOrderService extends CrudService<WebsiteUserOrderDao, We
 			try {
 				String body = alipayUtil.payQuery(order.getOrderNumber());
 				if (StringUtils.isNotEmpty(body)) {
-					JSONObject jo = JSONObject.parseObject(body);
+					JSONObject jo = JSONObject.parseObject(body).getJSONObject("alipay_trade_query_response");
 					String trade_status = jo.getString("trade_status");
 					if ("TRADE_SUCCESS".equals(trade_status) || "TRADE_FINISHED".equals(trade_status)) {
 						order.setPayStatus(Constants.orderPayStatus.PAY_SUCCESS);