|
|
|
@@ -83,7 +83,7 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
wxMerchantTradeDaily.setTradeAmt(Double.parseDouble(wxMerchantTradeDaily.getTradeAmt())*100 +""); |
|
|
|
} |
|
|
|
|
|
|
|
WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); |
|
|
|
WxMerchantBUser user = wxMerchantBUserService.getById(getUser().getId()); |
|
|
|
if (user==null) |
|
|
|
return new ResultData(ErrorCode.USER_IS_EMPTY); |
|
|
|
WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); |
|
|
|
@@ -104,9 +104,9 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
wxMerchantTradeDaily.setbUserId(getUserId()); |
|
|
|
wxMerchantTradeDaily.setbUserId(getUser().getId()); |
|
|
|
logger.info("1------------------------------------" + wxMerchantTradeDaily.getbUserId()); |
|
|
|
wxMerchantTradeDaily.setBUserId(getUserId()); |
|
|
|
wxMerchantTradeDaily.setBUserId(getUser().getId()); |
|
|
|
logger.info("2------------------------------------" + wxMerchantTradeDaily.getBUserId()); |
|
|
|
wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); |
|
|
|
return new ResultData(); |
|
|
|
@@ -127,7 +127,7 @@ public class WxMerchantTradeDailyController extends BaseController { |
|
|
|
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
|
|
|
|
//根据userid查询merchantId |
|
|
|
WxMerchantBUser user = wxMerchantBUserService.getById(getUserId()); |
|
|
|
WxMerchantBUser user = wxMerchantBUserService.getById(getUser().getId()); |
|
|
|
if (user==null) |
|
|
|
return new ResultData(ErrorCode.USER_IS_EMPTY); |
|
|
|
WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); |
|
|
|
|