| @@ -59,7 +59,7 @@ public class PosController extends BaseController { | |||||
| return posService.getQrCode(getTenantId()); | return posService.getQrCode(getTenantId()); | ||||
| } | } | ||||
| @ApiOperation(value = "会员识别") | |||||
| @ApiOperation(value = "会员识别", notes = "{\"mem_id\":\"string(可选)\",\"mem_phone\":\"string(可选)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(单位:分)(必填)\"}") | |||||
| @PostMapping("checkMem") | @PostMapping("checkMem") | ||||
| public ResultData checkMem(@RequestBody Map<String, String> params) { | public ResultData checkMem(@RequestBody Map<String, String> params) { | ||||
| WxMerchantBUser user = getUser(); | WxMerchantBUser user = getUser(); | ||||
| @@ -102,6 +102,21 @@ public class PosController extends BaseController { | |||||
| return posService.checkCouponOrderForIndepentVerify(user, verifyType, couponOrderIdStr); | return posService.checkCouponOrderForIndepentVerify(user, verifyType, couponOrderIdStr); | ||||
| } | } | ||||
| @ApiOperation(value = "券交易核销检查") | |||||
| @PostMapping("checkCouponOrderForPayVerify") | |||||
| public ResultData checkCouponOrderForPayVerify(@RequestBody Map<String, String> params) { | |||||
| WxMerchantBUser user = getUser(); | |||||
| String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID | |||||
| 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); | |||||
| } | |||||
| String verifyType = WxPayConstant.VERIFY_TYPE_PAY; | |||||
| return posService.checkCouponOrderForIndepentVerify(user, verifyType, couponOrderIdStr); | |||||
| } | |||||
| @ApiOperation(value = "券预核销") | @ApiOperation(value = "券预核销") | ||||
| @PostMapping("couponOrderPreVerify") | @PostMapping("couponOrderPreVerify") | ||||
| public ResultData couponOrderPreVerify(@RequestBody Map<String, String> params) { | public ResultData couponOrderPreVerify(@RequestBody Map<String, String> params) { | ||||
| @@ -1,8 +1,7 @@ | |||||
| package com.iformall.controller; | package com.iformall.controller; | ||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.service.PosBrunService; | |||||
| import com.iformall.service.PosPayOrderService; | |||||
| import com.iformall.domain.po.WxMerchantBUser; | |||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import lombok.AllArgsConstructor; | import lombok.AllArgsConstructor; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| @@ -41,9 +40,10 @@ public class PosOrderController extends BaseController { | |||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @ApiOperation("新增POS订单接口") | |||||
| @PostMapping("add") | |||||
| @ApiOperation(value = "新增POS订单接口", notes = "") | |||||
| @PostMapping("addForPosPay") | |||||
| public ResultData add(@RequestBody PosOrder posOrder) { | public ResultData add(@RequestBody PosOrder posOrder) { | ||||
| WxMerchantBUser user = getUser(); | |||||
| if (posOrder == null) { | if (posOrder == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| @@ -52,13 +52,21 @@ public class PosOrderController extends BaseController { | |||||
| logger.error(errMessage); | logger.error(errMessage); | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); | ||||
| } | } | ||||
| if (posOrder.getBuUserId() == null) { | |||||
| String errMessage = "操作员为空"; | |||||
| if (posOrder.getPaymentType() == null) { | |||||
| String errMessage = "支付类型为空"; | |||||
| logger.error(errMessage); | logger.error(errMessage); | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); | ||||
| } | } | ||||
| if (posOrder.getPayment() == null) { | |||||
| String errMessage = "支付金额为空"; | |||||
| logger.error(errMessage); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); | |||||
| } | |||||
| posOrder.setTenantId(user.getTenantId()); | |||||
| posOrder.setBuUserId(user.getId()); | |||||
| posOrderService.saveOrUpdate(posOrder); | posOrderService.saveOrUpdate(posOrder); | ||||
| return new ResultData(); | |||||
| return new ResultData(posOrder); | |||||
| } | } | ||||
| @ApiOperation("根据id更新接口") | @ApiOperation("根据id更新接口") | ||||
| @@ -31,6 +31,7 @@ public class PosOrderServiceImpl implements PosOrderService { | |||||
| if (record.getId() == null) { | if (record.getId() == null) { | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| record.setId(idWorker.nextId()); | record.setId(idWorker.nextId()); | ||||
| record.setPosOrderNo(String.valueOf(record.getId())); | |||||
| posOrderMapper.insertSelective(record); | posOrderMapper.insertSelective(record); | ||||
| } else { | } else { | ||||
| posOrderMapper.updateByPrimaryKeySelective(record); | posOrderMapper.updateByPrimaryKeySelective(record); | ||||