diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java index 78412687b..9cfa2ac97 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/TtOrderService.java @@ -33,7 +33,7 @@ public interface TtOrderService { TtOrder detail(Long orderId, Long memberId); - ResultData createPay(TenantEntity tenantEntity,Long orderId, Long memberId, WxAppinfo appinfo); + ResultData createPay(TenantEntity tenantEntity,Long orderId, Long memberId); ResultData updateOrderStatus(Long orderId, WxAppinfo cAppInfo, WxPayAccount payAccount); diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java index 19766b1f7..9a89bc274 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java @@ -204,7 +204,7 @@ public class TtOrderServiceImpl implements TtOrderService { } @Override - public ResultData createPay(TenantEntity tenantEntity,Long orderId, Long memberId, WxAppinfo appInfo) { + public ResultData createPay(TenantEntity tenantEntity,Long orderId, Long memberId) { TtOrder order = ttOrderMapper.selectById(orderId); if (null == order) { logger.error("pay order, order not allow, orderId: " + orderId); @@ -213,7 +213,7 @@ public class TtOrderServiceImpl implements TtOrderService { if(!order.getCUserId().equals(memberId)){ return new ResultData(ErrorCode.ORDER_USER_NOT_MATCH); } - TtCUser byId = ttCUserService.getById(memberId, tenantEntity.getTenantId()); + TtCUser byId = ttCUserService.getById(memberId, order.getTenantId()); // WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(memberId,tenantEntity.getFinalTenantId()); // if ( null == wxCUserBasicInfo) { if ( byId == null) { @@ -224,7 +224,7 @@ public class TtOrderServiceImpl implements TtOrderService { // return new ResultData(ErrorCode.MEMBER_IS_LOCKED); // } -// WxAppinfo appInfo = wxAppinfoService.getByAppId(appId); + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(order, EnumPayWay.PAY_WAY_TT); if(appInfo == null) { return new ResultData(ErrorCode.APP_ID_NOT_FOUND); } diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java index 60a72c4df..34e2f36c3 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtCouponController.java @@ -139,8 +139,8 @@ public class TtCouponController extends BaseController { if (id == null) { return new ResultData(ResultData.ERROR, "缺少id"); } - TtCoupon byId = ttCouponService.getById(id); - if(byId == null){ + TtCoupon coupon = ttCouponService.getById(id); + if(coupon == null){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"找不到数据"); } Long memberId; @@ -149,7 +149,7 @@ public class TtCouponController extends BaseController { } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); } - ttCouponService.collectCoupon(getTenantInfo(),memberId,byId.getId()); + ttCouponService.collectCoupon(coupon,memberId,coupon.getId()); return new ResultData(); } diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java index 36c0d008f..e81d50663 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtOrderController.java @@ -170,11 +170,7 @@ public class TtOrderController extends BaseController { } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); } - WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(getTenantInfo(), EnumPayWay.PAY_WAY_TT); - if(cAppInfo == null){ - return new ResultData(ErrorCode.APP_ID_NOT_ENABLE); - } - return ttOrderService.createPay(getTenantInfo(),orderId,memberId,cAppInfo); + return ttOrderService.createPay(getTenantInfo(),orderId,memberId); } diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java index 9c5c878ba..4490807e4 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -116,7 +116,7 @@ public class WxMerchantController extends BaseController { } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); } - wxMerchantService.followMerchant(getTenantInfo(),memberId,byId.getId()); + wxMerchantService.followMerchant(byId,memberId,byId.getId()); return new ResultData(); }