xhxu 5 лет назад
Родитель
Сommit
34be433454
3 измененных файлов: 17 добавлений и 15 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java
  2. +15
    -13
      mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
  3. +1
    -1
      mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java

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

@@ -27,7 +27,7 @@ public interface TtOrderService {
PageInfo<TtOrder> listAsPage(TtOrder record, Integer pageIndex, Integer pageSize); PageInfo<TtOrder> listAsPage(TtOrder record, Integer pageIndex, Integer pageSize);
PageInfo<TtOrder> listCAsPage(TtOrder order, Integer pageNum, Integer pageSize); PageInfo<TtOrder> listCAsPage(TtOrder order, Integer pageNum, Integer pageSize);


ResultData saveOrder(Long couponId, Long memberId, EnumPayWay payWay, TenantEntity tenantInfo);
ResultData saveOrder(Long couponId, Long memberId, EnumPayWay payWay);


ResultData cancelOrder(Long orderId, Long memberId); ResultData cancelOrder(Long orderId, Long memberId);




+ 15
- 13
mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java Просмотреть файл

@@ -80,9 +80,20 @@ public class TtOrderServiceImpl implements TtOrderService {
} }


@Override @Override
public ResultData saveOrder(Long couponId,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity) {
public ResultData saveOrder(Long couponId,Long cUserId,EnumPayWay payWay) {
TtCoupon coupon = ttcouponMapper.selectById(couponId);
if (null == coupon) {
return new ResultData(ErrorCode.TTCOUPON_IS_EMPTY);
}
if (!coupon.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode())) {
return new ResultData(ErrorCode.TTCOUPON_IS_TAKE_OFF);
}
if(coupon.getSalePrice() == null || coupon.getSalePrice().intValue() == 0){
return new ResultData(ErrorCode.TTCOUPON_IS_TAKE_OFF);
}

logger.info("OrderSave: couponId:" + couponId + "---cUserId:"+cUserId); logger.info("OrderSave: couponId:" + couponId + "---cUserId:"+cUserId);
TtCUser byId = ttCUserService.getById(cUserId, tenantEntity.getTenantId());
TtCUser byId = ttCUserService.getById(cUserId, coupon.getTenantId());
// WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUserId,tenantEntity.getFinalTenantId()); // WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUserId,tenantEntity.getFinalTenantId());
// if(wxCUserBasicInfo == null){ // if(wxCUserBasicInfo == null){
if(byId == null){ if(byId == null){
@@ -105,16 +116,7 @@ public class TtOrderServiceImpl implements TtOrderService {
// logger.info("会员权益被锁定:cUserId:" + cUserId); // logger.info("会员权益被锁定:cUserId:" + cUserId);
// return new ResultData(ErrorCode.MEMBER_IS_LOCKED); // return new ResultData(ErrorCode.MEMBER_IS_LOCKED);
// } // }
TtCoupon coupon = ttcouponMapper.selectById(couponId);
if (null == coupon) {
return new ResultData(ErrorCode.TTCOUPON_IS_EMPTY);
}
if (!coupon.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode())) {
return new ResultData(ErrorCode.TTCOUPON_IS_TAKE_OFF);
}
if(coupon.getSalePrice() == null || coupon.getSalePrice().intValue() == 0){
return new ResultData(ErrorCode.TTCOUPON_IS_TAKE_OFF);
}



try { try {
// 4.2 保存订单 // 4.2 保存订单
@@ -122,7 +124,7 @@ public class TtOrderServiceImpl implements TtOrderService {
Date now = new Date(); Date now = new Date();
TtOrder order = new TtOrder(); TtOrder order = new TtOrder();
order.setId(idWorker.nextId()); order.setId(idWorker.nextId());
order.updateTenantInfo(tenantEntity);
order.updateTenantInfo(coupon);
order.setCUserId(cUserId); order.setCUserId(cUserId);
order.setProductId(coupon.getId()); order.setProductId(coupon.getId());
order.setProductTitle(coupon.getTitle()); order.setProductTitle(coupon.getTitle());


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

@@ -80,7 +80,7 @@ public class TtOrderController extends BaseController {
} catch (MallinkException e) { } catch (MallinkException e) {
return new ResultData(e.getErrorCode(), e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage());
} }
return ttOrderService.saveOrder(couponId,memberId,EnumPayWay.PAY_WAY_TT,getTenantInfo());
return ttOrderService.saveOrder(couponId,memberId,EnumPayWay.PAY_WAY_TT);
} }






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