Browse Source

update

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
2d89b96c15
3 changed files with 17 additions and 17 deletions
  1. +14
    -14
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 14
- 14
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java View File

@@ -110,10 +110,10 @@ public class WxMicroPayController extends BaseController {
try {
return wxPayOrderService.createMicroPayOrder(user, record, payWay, null);
} catch (MallinkException e) {
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage());
}
}
@@ -166,10 +166,10 @@ public class WxMicroPayController extends BaseController {
ResultData resultData = wxPayOrderService.payOrderQuery(user, record, payWay);
return resultData;
} catch (MallinkException e) {
logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(ErrorCode.PAY_ORDER_QUERY_ERROR, e.getMessage());
}
}
@@ -218,10 +218,10 @@ public class WxMicroPayController extends BaseController {
try {
return wxPayOrderService.payOrderReverse(record);
} catch (MallinkException e) {
logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order query error, req 2: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order query error, req 3: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage());
}
}
@@ -342,10 +342,10 @@ public class WxMicroPayController extends BaseController {

order = wxOrderService.saveMicroPayOrderV2(user, cUser, payment);
} catch (MallinkException e) {
logger.error("saveMicopayOrder 1" + e.getMessage());
logger.error("saveMicopayOrder 1" + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("saveMicopayOrder 2" + e.getMessage());
logger.error("saveMicopayOrder 2" + e.getMessage(),e);
return new ResultData(ErrorCode.ORDER_IS_FAIL, e.getMessage());
}

@@ -448,10 +448,10 @@ public class WxMicroPayController extends BaseController {
updateOrder.setPayment(remainPrice);
wxOrderService.saveOrUpdate(updateOrder);
} catch (MallinkException e) {
logger.error("核销异常: " + e.getMessage());
logger.error("核销异常: " + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("核销异常: " + e.getMessage());
logger.error("核销异常: " + e.getMessage(),e);
return new ResultData(ErrorCode.VERIFY_ERROR, e.getMessage());
}
}
@@ -477,10 +477,10 @@ public class WxMicroPayController extends BaseController {
try {
return wxPayOrderService.createMicroPayOrder(user, record, payWay, null);
} catch (MallinkException e) {
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage(),e);
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage());
}
} else {
@@ -492,10 +492,10 @@ public class WxMicroPayController extends BaseController {
map.put("end", "1");
return new ResultData(map);
} catch (MallinkException e) {
logger.error("payment wechat, order create error, req 2: " + couponPayOrder.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order create error, req 2: " + couponPayOrder.toString() + ", e:" + e.getMessage(),e);
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("payment wechat, order create error, req 3: " + couponPayOrder.toString() + ", e:" + e.getMessage());
logger.error("payment wechat, order create error, req 3: " + couponPayOrder.toString() + ", e:" + e.getMessage(),e);
return new ResultData(ErrorCode.PAY_ORDER_ERROR, e.getMessage());
}
}


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -1154,9 +1154,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
JSONObject couponObj = calcOneCouponPay(couponOrderCVo, payPrice);
couponList.add(couponObj);
} catch (MallinkException e) {
logger.error(e.getMessage());
logger.error(e.getMessage(),e);
} catch (Exception e) {
logger.error(e.getMessage());
logger.error(e.getMessage(),e);
}
}
return couponList;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -938,7 +938,7 @@ public class WxOrderServiceImpl implements WxOrderService {
// 保存订单
wxOrderMapper.insert(record);
} catch (RuntimeException e) {
logger.error("保存订单:" + e.getMessage());
logger.error("保存订单:" + e.getMessage(),e);
throw new MallinkException(ErrorCode.ORDER_SAVE_ERR);
}
return record;


Loading…
Cancel
Save