diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java index 5d57c3244..af4358ef2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/pay/AlipayController.java @@ -180,7 +180,7 @@ public class AlipayController extends BaseController { //设置模板编号 wxMall.setAlipayMemberTemplateId(templateId); mallService.update(wxMall); - return new ResultData(); + return new ResultData(templateId); } } catch (Exception e) { diff --git a/mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx b/mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx new file mode 100644 index 000000000..09f02fa6d Binary files /dev/null and b/mallinkAdmin/src/main/resources/doc/支付宝自助积分接入文档.docx differ diff --git a/mallinkService/src/main/java/com/iformall/service/pay/alipay/AliPayUtil.java b/mallinkService/src/main/java/com/iformall/service/pay/alipay/AliPayUtil.java index 7938d2b12..527d85e26 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/alipay/AliPayUtil.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/alipay/AliPayUtil.java @@ -93,7 +93,7 @@ public class AliPayUtil { return null; } - private static JSONObject getGenericResponse(String result,String key) { + private static JSONObject getGenericResponseWithCodes(String result,String key,String[] successCodes) { if (StringUtils.isBlank(result)) { log.error("alipay apiresponse ["+key+"] error. no result."+result); return null; @@ -103,8 +103,10 @@ public class AliPayUtil { JSONObject resultObject = object.getJSONObject(key); if (null != resultObject ) { String code = resultObject.getString("code"); - if (("10000".equals(code))) { - return resultObject; + for (String successCode : successCodes) { + if ((successCode.equals(code))) { + return resultObject; + } } } } @@ -112,6 +114,10 @@ public class AliPayUtil { return null; } + private static JSONObject getGenericResponse(String result,String key) { + return getGenericResponseWithCodes(result,key,new String[] {"10000"}); + } + //门店照片上传 public String merchantImageUpload(String appAuthToken,String imageName,byte[] file) { String temfolder = "/alipaytempfile/"+UUID.randomUUID(); @@ -302,7 +308,7 @@ public class AliPayUtil { public boolean smartDistrictTopicSubscribe(String appAuthToken,String topic) { try { AlipayOpenApiGenericResponse response = AliPayApi.topicSubscribe(getConfig(),appAuthToken, "app_auth", topic, "HTTP", "BIZ_TAG"); - JSONObject result = getGenericResponse(response.getHttpBody(),"alipay_open_app_message_topic_subscribe_response"); + JSONObject result = getGenericResponseWithCodes(response.getHttpBody(),"alipay_open_app_message_topic_subscribe_response",new String[] {"40004","10000"}); if (null != result) { return true; }