update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantPaymentOrderServiceImpl.java

@@ -233,9 +233,9 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 			// 更新订单状态
 			String[] statusArr = { "0", "1", "7" };
 			String responseParameters = queryRs.getResponseParameters();
-			List<Map<String, String>> responseList = JSON.parseObject(responseParameters, List.class);
-			for (Map<String, String> response : responseList) {
-				Map<String, String> rpMap = response;
+			List<Map<String, Object>> responseList = JSON.parseObject(responseParameters, List.class);
+			for (Map<String, Object> response : responseList) {
+				Map<String, Object> rpMap = response;
 				String channelType = rpMap.get("channelType").equals("1") ? "WXPay" : (rpMap.get("channelType").equals("2") ? "Alipay" : "quickPay");
 				rpMap.put("channelType", channelType);
 
@@ -246,7 +246,7 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 				if (Arrays.asList(statusArr).contains(rpMap.get("tradeState"))) {
 					try {
 						DealStatusEnum status = rpMap.get("tradeState").equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
-						TenantPaymentOrder order = tenantPaymentOrderDao.findOrderByOrderNo(rpMap.get("merOrderNo"));
+						TenantPaymentOrder order = tenantPaymentOrderDao.findOrderByOrderNo(rpMap.get("merOrderNo").toString());
 						if (order == null || !order.getStatus().equals(DealStatusEnum.ING)) {
 							continue;
 						}
@@ -254,12 +254,12 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
 						if (status.equals(DealStatusEnum.SUCCESS)) {
 							order.setPayTime(new Date());
 						} else {
-							order.setMemo(rpMap.get("remarks"));
+							order.setMemo(rpMap.get("remarks").toString());
 						}
 						order.setStatus(status);
-						order.setTransNo(rpMap.get("orderNo"));
+						order.setTransNo(rpMap.get("orderNo").toString());
 						order.setPaymentBusinessChannel(channelType);
-						order.setActualAmount(new BigDecimal(rpMap.get("totalMoney")));
+						order.setActualAmount(new BigDecimal(rpMap.get("totalMoney").toString()));
 						paymentForCallback(order);
 					} catch (Exception e) {
 						e.printStackTrace();