xhxu 5 лет назад
Родитель
Сommit
00418cd244
3 измененных файлов: 4 добавлений и 4 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java
  2. +2
    -2
      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> listCAsPage(TtOrder order, Integer pageNum, Integer pageSize);

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

ResultData cancelOrder(Long orderId, Long memberId);



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

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

@Override
public ResultData saveOrder(Long couponId,Long cUserId,EnumPayWay payWay) {
public ResultData saveOrder(TenantEntity tenantEntity,Long couponId,Long cUserId,EnumPayWay payWay) {
TtCoupon coupon = ttcouponMapper.selectById(couponId);
if (null == coupon) {
return new ResultData(ErrorCode.TTCOUPON_IS_EMPTY);
@@ -93,7 +93,7 @@ public class TtOrderServiceImpl implements TtOrderService {
}

logger.info("OrderSave: couponId:" + couponId + "---cUserId:"+cUserId);
TtCUser byId = ttCUserService.getById(cUserId, coupon.getTenantId());
TtCUser byId = ttCUserService.getById(cUserId, tenantEntity.getTenantId());
// WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(cUserId,tenantEntity.getFinalTenantId());
// if(wxCUserBasicInfo == null){
if(byId == null){


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

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




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