Browse Source

cs

release_toaliyun_real
xhxu 4 years ago
parent
commit
236986d689
2 changed files with 21 additions and 5 deletions
  1. +15
    -4
      mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java
  2. +6
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java

+ 15
- 4
mallinkCallback/src/main/java/com/iformall/controller/callback/AliPayController.java View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.*;
import com.iformall.exception.MallinkException;
import com.iformall.service.*;
import com.iformall.service.pay.alipay.AliPayUtil;
import com.iformall.service.pay.alipay.api.enums.EnumMemberCardConfig;
@@ -258,9 +259,14 @@ public class AliPayController extends BaseController {
aliBusinessCircleOrder.setMallId(mallId);
aliBusinessCircleOrder.setMallName(mallName);

try{
aliBusinessCircleOrderService.createOrder(merchant,aliBusinessCircleOrder);
return "success";
}catch(MallinkException e){
logger.error("处理订单 error"+e.getMessage());
return "fail";
}

aliBusinessCircleOrderService.createOrder(merchant,aliBusinessCircleOrder);
return "success";
}
//退款成功
}else if ("alipay.business.mall.trade.refunded".equals(msgMethod)) {
@@ -298,8 +304,13 @@ public class AliPayController extends BaseController {
aliBusinessCircleOrder.setMallId(mallId);
aliBusinessCircleOrder.setMallName(mallName);

aliBusinessCircleOrderService.insertRefundNoticeOrder(merchant,aliBusinessCircleOrder);
return "success";
try{
aliBusinessCircleOrderService.insertRefundNoticeOrder(merchant,aliBusinessCircleOrder);
return "success";
}catch(MallinkException e){
logger.error("处理订单 error"+e.getMessage());
return "fail";
}
}
}else{
logger.error("alipay notify . 未知通知:"+paramMap);


+ 6
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/WxBusinessOrderController.java View File

@@ -10,6 +10,7 @@ import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxBusinessCircleOrder;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumThirdPartyConfigType;
import com.iformall.exception.MallinkException;
import com.iformall.interceptor.BodyReaderHttpServletRequestWrapper;
import com.iformall.pay.WxPayConstant;
import com.iformall.service.WxBusinessCircleOrderService;
@@ -158,7 +159,11 @@ public class WxBusinessOrderController extends BaseController {
logger.error("微信商圈通知---时间转换异常");
resultMap.put("code","FAIL");
return resultMap;
} catch (Exception e){
} catch(MallinkException e){
logger.error("微信商圈通知---"+e.getMessage());
resultMap.put("code","FAIL");
return resultMap;
}catch (Exception e){
e.printStackTrace();
logger.error("微信商圈通知---其他异常");
resultMap.put("code","FAIL");


Loading…
Cancel
Save