Преглед изворни кода

[POS][修改]:POS交易核销检查

release_toaliyun_real
Stormeye Wu пре 6 година
родитељ
комит
2366d5a45c
2 измењених фајлова са 17 додато и 5 уклоњено
  1. +14
    -2
      mallinkBApi/src/main/java/com/iformall/controller/PosController.java
  2. +3
    -3
      mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java

+ 14
- 2
mallinkBApi/src/main/java/com/iformall/controller/PosController.java Прегледај датотеку

@@ -102,19 +102,31 @@ public class PosController extends BaseController {
return posService.checkCouponOrderForIndepentVerify(user, verifyType, couponOrderIdStr); return posService.checkCouponOrderForIndepentVerify(user, verifyType, couponOrderIdStr);
} }


@ApiOperation(value = "券交易核销检查")
@ApiOperation(value = "券交易核销检查", notes = "{\"coupon_order_id\":\"string(必填)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(必填)\"}")
@PostMapping("checkCouponOrderForPayVerify") @PostMapping("checkCouponOrderForPayVerify")
public ResultData checkCouponOrderForPayVerify(@RequestBody Map<String, String> params) { public ResultData checkCouponOrderForPayVerify(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser(); WxMerchantBUser user = getUser();
String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID 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)) { if (StringUtils.isBlank(couponOrderIdStr)) {
String errMessage = "request params[coupon_order_id] error."; String errMessage = "request params[coupon_order_id] error.";
logger.error(errMessage); logger.error(errMessage);
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), 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; String verifyType = WxPayConstant.VERIFY_TYPE_PAY;
return posService.checkCouponOrderForIndepentVerify(user, verifyType, couponOrderIdStr);
return posService.checkCouponOrderForPayVerify(user, verifyType, couponOrderIdStr, posOrderIdStr, posAmountStr);
} }


@ApiOperation(value = "券预核销") @ApiOperation(value = "券预核销")


+ 3
- 3
mallinkBApi/src/main/java/com/iformall/service/PosBrunService.java Прегледај датотеку

@@ -228,7 +228,7 @@ public class PosBrunService {
} }


/** /**
* 券独立核销检查
* 券交易核销检查
* @param user * @param user
* @param verifyType * @param verifyType
* @param couponOrderIdStr * @param couponOrderIdStr
@@ -236,14 +236,14 @@ public class PosBrunService {
* @param posAmountStr * @param posAmountStr
* @return * @return
*/ */
public ResultData checkCouponOrderForVerify(WxMerchantBUser user,
public ResultData checkCouponOrderForPayVerify(WxMerchantBUser user,
String verifyType, String verifyType,
String couponOrderIdStr, String couponOrderIdStr,
String posOrderIdStr, String posAmountStr) { String posOrderIdStr, String posAmountStr) {
try { try {
String resStr = posUtil.checkCouponOrderForVerify(posUrl, posDevId, posReqKey, String resStr = posUtil.checkCouponOrderForVerify(posUrl, posDevId, posReqKey,
user.getTenantId(), String.valueOf(user.getMerchantId()), String.valueOf(user.getId()), user.getTenantId(), String.valueOf(user.getMerchantId()), String.valueOf(user.getId()),
couponOrderIdStr, verifyType, posOrderIdStr, posAmountStr);
verifyType, couponOrderIdStr, posOrderIdStr, posAmountStr);
if (resStr != null) { if (resStr != null) {
JSONObject retObj = JSON.parseObject(resStr); JSONObject retObj = JSON.parseObject(resStr);
Map options = retObj; Map options = retObj;


Loading…
Откажи
Сачувај