diff --git a/mallinkBApi/src/main/java/com/iformall/controller/PosController.java b/mallinkBApi/src/main/java/com/iformall/controller/PosController.java index c2400a527..80872cd09 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosController.java @@ -102,19 +102,31 @@ public class PosController extends BaseController { return posService.checkCouponOrderForIndepentVerify(user, verifyType, couponOrderIdStr); } - @ApiOperation(value = "券交易核销检查") + @ApiOperation(value = "券交易核销检查", notes = "{\"coupon_order_id\":\"string(必填)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(必填)\"}") @PostMapping("checkCouponOrderForPayVerify") public ResultData checkCouponOrderForPayVerify(@RequestBody Map params) { WxMerchantBUser user = getUser(); String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID + String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID + String posAmountStr = params.get(WxPayConstant.POS_AMOUNT); // POS订单金额 if (StringUtils.isBlank(couponOrderIdStr)) { String errMessage = "request params[coupon_order_id] error."; logger.error(errMessage); throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); } + if (StringUtils.isBlank(posOrderIdStr)) { + String errMessage = "request params[pos_order_id] error."; + logger.error(errMessage); + throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); + } + if (StringUtils.isBlank(posAmountStr)) { + String errMessage = "request params[pos_amount] error."; + logger.error(errMessage); + throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); + } String verifyType = WxPayConstant.VERIFY_TYPE_PAY; - return posService.checkCouponOrderForIndepentVerify(user, verifyType, couponOrderIdStr); + return posService.checkCouponOrderForPayVerify(user, verifyType, couponOrderIdStr, posOrderIdStr, posAmountStr); } @ApiOperation(value = "券预核销") diff --git a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java index a1a1601e9..db6f75a95 100644 --- a/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java +++ b/mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java @@ -228,7 +228,7 @@ public class PosBrunService { } /** - * 券独立核销检查 + * 券交易核销检查 * @param user * @param verifyType * @param couponOrderIdStr @@ -236,14 +236,14 @@ public class PosBrunService { * @param posAmountStr * @return */ - public ResultData checkCouponOrderForVerify(WxMerchantBUser user, + public ResultData checkCouponOrderForPayVerify(WxMerchantBUser user, String verifyType, String couponOrderIdStr, String posOrderIdStr, String posAmountStr) { try { String resStr = posUtil.checkCouponOrderForVerify(posUrl, posDevId, posReqKey, user.getTenantId(), String.valueOf(user.getMerchantId()), String.valueOf(user.getId()), - couponOrderIdStr, verifyType, posOrderIdStr, posAmountStr); + verifyType, couponOrderIdStr, posOrderIdStr, posAmountStr); if (resStr != null) { JSONObject retObj = JSON.parseObject(resStr); Map options = retObj;