Просмотр исходного кода

[POS][修改]:POS订单创建, POS会员识别

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
2ded4f18f1
3 измененных файлов: 32 добавлений и 8 удалений
  1. +16
    -1
      mallinkBApi/src/main/java/com/iformall/controller/PosController.java
  2. +15
    -7
      mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java

+ 16
- 1
mallinkBApi/src/main/java/com/iformall/controller/PosController.java Просмотреть файл

@@ -59,7 +59,7 @@ public class PosController extends BaseController {
return posService.getQrCode(getTenantId());
}

@ApiOperation(value = "会员识别")
@ApiOperation(value = "会员识别", notes = "{\"mem_id\":\"string(可选)\",\"mem_phone\":\"string(可选)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(单位:分)(必填)\"}")
@PostMapping("checkMem")
public ResultData checkMem(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser();
@@ -102,6 +102,21 @@ public class PosController extends BaseController {
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 = "券预核销")
@PostMapping("couponOrderPreVerify")
public ResultData couponOrderPreVerify(@RequestBody Map<String, String> params) {


+ 15
- 7
mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java Просмотреть файл

@@ -1,8 +1,7 @@
package com.iformall.controller;

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 lombok.AllArgsConstructor;
import org.slf4j.Logger;
@@ -41,9 +40,10 @@ public class PosOrderController extends BaseController {
return new ResultData(page);
}

@ApiOperation("新增POS订单接口")
@PostMapping("add")
@ApiOperation(value = "新增POS订单接口", notes = "")
@PostMapping("addForPosPay")
public ResultData add(@RequestBody PosOrder posOrder) {
WxMerchantBUser user = getUser();
if (posOrder == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
@@ -52,13 +52,21 @@ public class PosOrderController extends BaseController {
logger.error(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);
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);
return new ResultData();
return new ResultData(posOrder);
}

@ApiOperation("根据id更新接口")


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/PosOrderServiceImpl.java Просмотреть файл

@@ -31,6 +31,7 @@ public class PosOrderServiceImpl implements PosOrderService {
if (record.getId() == null) {
final IdWorker idWorker = IdWorker.get();
record.setId(idWorker.nextId());
record.setPosOrderNo(String.valueOf(record.getId()));
posOrderMapper.insertSelective(record);
} else {
posOrderMapper.updateByPrimaryKeySelective(record);


Загрузка…
Отмена
Сохранить