| @@ -7,6 +7,7 @@ import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.vo.WxCardSpendVo; | import com.iformall.domain.vo.WxCardSpendVo; | ||||
| import com.iformall.domain.vo.WxCardVo; | import com.iformall.domain.vo.WxCardVo; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| @@ -170,9 +171,9 @@ public class WxCardPayController extends BaseController { | |||||
| if (wxCardInfo.getId() == null) { | if (wxCardInfo.getId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件ID为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件ID为空"); | ||||
| } | } | ||||
| String tenantId = getTenantId(); | |||||
| wxCardInfo.setTenantId(tenantId); | |||||
| int remainShareAmount = wxCardSpendService.finishCard(tenantId, wxCardInfo.getId()); | |||||
| TenantEntity tenantEntity = getTenantInfo(); | |||||
| wxCardInfo.updateTenantInfo(tenantEntity); | |||||
| int remainShareAmount = wxCardSpendService.finishCard(tenantEntity, wxCardInfo.getId()); | |||||
| return new ResultData(remainShareAmount); | return new ResultData(remainShareAmount); | ||||
| } | } | ||||
| @@ -113,7 +113,7 @@ public class WxCouponController extends BaseController { | |||||
| } | } | ||||
| if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ | if(EnumDelFlag.YES.getCode().equals(wxCoupon.getIsDel())){ | ||||
| WxCouponChannel query = new WxCouponChannel(); | WxCouponChannel query = new WxCouponChannel(); | ||||
| query.setTenantId(wxCoupon.getTenantId()); | |||||
| query.updateTenantInfo(wxCoupon); | |||||
| query.setCouponId(wxCoupon.getId()); | query.setCouponId(wxCoupon.getId()); | ||||
| query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); | ||||
| if(CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))){ | if(CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))){ | ||||
| @@ -238,7 +238,7 @@ public class WxCouponController extends BaseController { | |||||
| wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantId()); | wxFlowService.start(wxCoupon.getFlowParams(), getUserId(), getUser().getName(), getTenantId()); | ||||
| //更新状态 | //更新状态 | ||||
| WxCoupon updateCoupon = new WxCoupon(); | WxCoupon updateCoupon = new WxCoupon(); | ||||
| updateCoupon.setTenantId(wxCoupon.getTenantId()); | |||||
| updateCoupon.updateTenantInfo(wxCoupon); | |||||
| updateCoupon.setId(wxCoupon.getId()); | updateCoupon.setId(wxCoupon.getId()); | ||||
| updateCoupon.setStockApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); | updateCoupon.setStockApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); | ||||
| updateCoupon.setUpdateDate(new Date()); | updateCoupon.setUpdateDate(new Date()); | ||||
| @@ -59,7 +59,7 @@ public class WxCouponInjectController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] WxCouponInjectController::add"); | logger.debug("[" + getIpAddr() + "] WxCouponInjectController::add"); | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| couponInject.setTenantId(user.getTenantId()); | |||||
| couponInject.updateTenantInfo(user); | |||||
| couponInject.setMUserId(user.getId()); | couponInject.setMUserId(user.getId()); | ||||
| return wxCouponInjectService.add(couponInject); | return wxCouponInjectService.add(couponInject); | ||||
| @@ -89,7 +89,7 @@ public class WxCouponPresentController extends BaseController { | |||||
| } | } | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| wxCouponPresent.setUserId(user.getId()); | wxCouponPresent.setUserId(user.getId()); | ||||
| wxCouponPresent.setTenantId(user.getTenantId()); | |||||
| wxCouponPresent.updateTenantInfo(user); | |||||
| try { | try { | ||||
| pushLimitService.checkSendTime(user.getTenantId()); | pushLimitService.checkSendTime(user.getTenantId()); | ||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| @@ -117,7 +117,7 @@ public class WxCouponPresentController extends BaseController { | |||||
| } | } | ||||
| //查询有效券数量 | //查询有效券数量 | ||||
| WxCouponPassword wxCouponPassword = new WxCouponPassword(); | WxCouponPassword wxCouponPassword = new WxCouponPassword(); | ||||
| wxCouponPassword.setTenantId(user.getTenantId()); | |||||
| wxCouponPassword.updateTenantInfo(user); | |||||
| wxCouponPassword.setCouponId(wxCouponPresent.getCouponId()); | wxCouponPassword.setCouponId(wxCouponPresent.getCouponId()); | ||||
| wxCouponPassword.setStatus(EnumCouponPasswordStatus.INIT.getCode()); | wxCouponPassword.setStatus(EnumCouponPasswordStatus.INIT.getCode()); | ||||
| List<WxCouponPassword> list = wxCouponPasswordService.findList(wxCouponPassword); | List<WxCouponPassword> list = wxCouponPasswordService.findList(wxCouponPassword); | ||||
| @@ -115,7 +115,7 @@ public class WxCouponSendController extends BaseController { | |||||
| return new ResultData(ErrorCode.COUPON_TYPE_IS_NOT_PASSIVE); | return new ResultData(ErrorCode.COUPON_TYPE_IS_NOT_PASSIVE); | ||||
| } | } | ||||
| wxCouponSend.setTenantId(wxCoupon.getTenantId()); | |||||
| wxCouponSend.updateTenantInfo(wxCoupon); | |||||
| wxCouponSend.setTitle(wxCoupon.getTitle()); | wxCouponSend.setTitle(wxCoupon.getTitle()); | ||||
| wxCouponSend.setCreateDate(new Date()); | wxCouponSend.setCreateDate(new Date()); | ||||
| @@ -31,8 +31,7 @@ public class WxTopicController extends BaseController { | |||||
| @SystemControllerLog(description = "专题-列表") | @SystemControllerLog(description = "专题-列表") | ||||
| public ResultData list(WxTopic wxTopic, Integer pageNum, Integer pageSize) { | public ResultData list(WxTopic wxTopic, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxTopicController::list"); | logger.debug("[" + getIpAddr() + "] WxTopicController::list"); | ||||
| String tenantId = getTenantId(); | |||||
| wxTopic.setTenantId(tenantId); | |||||
| wxTopic.updateTenantInfo(getTenantInfo()); | |||||
| PageInfo<WxTopic> page = wxTopicService.listAsPage(wxTopic, pageNum, pageSize); | PageInfo<WxTopic> page = wxTopicService.listAsPage(wxTopic, pageNum, pageSize); | ||||
| //可投放、已上线,时间区间查的是活动开始时间 | //可投放、已上线,时间区间查的是活动开始时间 | ||||
| @@ -41,7 +40,10 @@ public class WxTopicController extends BaseController { | |||||
| //设置正在上架的专题 | //设置正在上架的专题 | ||||
| Date now = new Date(); | Date now = new Date(); | ||||
| page.getList().stream().forEach(cc->{ | page.getList().stream().forEach(cc->{ | ||||
| if (cc.getStatus().equals(EnumWxTopicStatus.VAILD.getCode()) && cc.getEndTime()!=null && cc.getBeginTime()!=null && now.getTime() >= cc.getBeginTime().getTime() && now.getTime() <= cc.getEndTime().getTime()) { | |||||
| if (cc.getStatus().equals(EnumWxTopicStatus.VAILD.getCode()) && | |||||
| cc.getEndTime()!=null && cc.getBeginTime()!=null && | |||||
| now.getTime() >= cc.getBeginTime().getTime() && | |||||
| now.getTime() <= cc.getEndTime().getTime()) { | |||||
| cc.setIsOnline(1); | cc.setIsOnline(1); | ||||
| } | } | ||||
| }); | }); | ||||
| @@ -52,8 +54,7 @@ public class WxTopicController extends BaseController { | |||||
| @SystemControllerLog(description = "专题-获取详情") | @SystemControllerLog(description = "专题-获取详情") | ||||
| public ResultData findById(WxTopic wxTopic) { | public ResultData findById(WxTopic wxTopic) { | ||||
| logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); | logger.debug("[" + getIpAddr() + "] WxTopicController::findById"); | ||||
| String tenantId = getTenantId(); | |||||
| wxTopic.setTenantId(tenantId); | |||||
| wxTopic.updateTenantInfo(getTenantInfo()); | |||||
| WxTopic queryTopic = wxTopicService.findById(wxTopic); | WxTopic queryTopic = wxTopicService.findById(wxTopic); | ||||
| return new ResultData(queryTopic); | return new ResultData(queryTopic); | ||||
| } | } | ||||
| @@ -62,7 +63,7 @@ public class WxTopicController extends BaseController { | |||||
| @SystemControllerLog(description = "专题-保存更新") | @SystemControllerLog(description = "专题-保存更新") | ||||
| public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) { | public ResultData saveOrUpdate(@RequestBody WxTopic wxTopic) { | ||||
| logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate"); | logger.debug("[" + getIpAddr() + "] WxTopicController::saveOrUpdate"); | ||||
| wxTopic.setTenantId(super.getTenantId()); | |||||
| wxTopic.updateTenantInfo(getTenantInfo()); | |||||
| return wxTopicService.saveOrUpdate(wxTopic); | return wxTopicService.saveOrUpdate(wxTopic); | ||||
| } | } | ||||
| @@ -106,7 +106,7 @@ public class AsyncTask { | |||||
| try { | try { | ||||
| successList.parallelStream().forEach(uBase -> { | successList.parallelStream().forEach(uBase -> { | ||||
| try { | try { | ||||
| wxCUserBasicInfoService.importOneMem(tenantId, importKey, tagList, uBase,user); | |||||
| wxCUserBasicInfoService.importOneMem(importKey, tagList, uBase, user); | |||||
| } catch (UnknownSessionException ue) { | } catch (UnknownSessionException ue) { | ||||
| logger.error("session :"+ue.getMessage()); | logger.error("session :"+ue.getMessage()); | ||||
| } | } | ||||
| @@ -8,6 +8,7 @@ import cn.afterturn.easypoi.handler.inter.IExcelDataHandler; | |||||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | ||||
| import com.iformall.domain.po.MallUserInfo; | import com.iformall.domain.po.MallUserInfo; | ||||
| import com.iformall.domain.po.WxShop; | import com.iformall.domain.po.WxShop; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.vo.WxBillDailyVo; | import com.iformall.domain.vo.WxBillDailyVo; | ||||
| import com.iformall.enums.EnumDelStatus; | import com.iformall.enums.EnumDelStatus; | ||||
| import com.iformall.enums.EnumShopStatus; | import com.iformall.enums.EnumShopStatus; | ||||
| @@ -63,7 +64,7 @@ public class BillDailyAsyncTask { | |||||
| } | } | ||||
| @Async | @Async | ||||
| public void importExcelData(File file, MallUserInfo user, String importKey, String tenantId) { | |||||
| public void importExcelData(File file, MallUserInfo user, String importKey) { | |||||
| ImportParams params = new ImportParams(); | ImportParams params = new ImportParams(); | ||||
| // 需要验证 | // 需要验证 | ||||
| params.setImportFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*", "租赁商铺类型*"}); | params.setImportFields(new String[]{"商铺号*", "费用类型*", "实际应收金额(元)*", "实收金额(元)*", "缴款截止日期*", "租赁商铺类型*"}); | ||||
| @@ -101,7 +102,7 @@ public class BillDailyAsyncTask { | |||||
| //店铺 | //店铺 | ||||
| WxShop shop = new WxShop(); | WxShop shop = new WxShop(); | ||||
| shop.setShopNumber(vo.getShopNumber()); | shop.setShopNumber(vo.getShopNumber()); | ||||
| shop.setTenantId(tenantId); | |||||
| shop.updateTenantInfo(user); | |||||
| shop.setType(vo.getRentShopType()); | shop.setType(vo.getRentShopType()); | ||||
| shop.setStatus(EnumShopStatus.RENT.getCode()); | shop.setStatus(EnumShopStatus.RENT.getCode()); | ||||
| shop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | shop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| @@ -133,7 +134,7 @@ public class BillDailyAsyncTask { | |||||
| } | } | ||||
| vo.setReceivePay(receivePay); | vo.setReceivePay(receivePay); | ||||
| vo.setPay(pay); | vo.setPay(pay); | ||||
| vo.setTenantId(tenantId); | |||||
| vo.updateTenantInfo(user); | |||||
| vo.setShopId(wxShop.getId()); | vo.setShopId(wxShop.getId()); | ||||
| vo.setRentShopType(wxShop.getType()); | vo.setRentShopType(wxShop.getType()); | ||||
| processList.add(vo); | processList.add(vo); | ||||
| @@ -56,7 +56,7 @@ public class ImportTemplateTask { | |||||
| @Async | @Async | ||||
| public void importBillData(File file, MallUserInfo user, String importKey, String tenantId) { | |||||
| public void importBillData(File file, MallUserInfo user, String importKey) { | |||||
| ImportParams params = new ImportParams(); | ImportParams params = new ImportParams(); | ||||
| // 需要验证 | // 需要验证 | ||||
| params.setImportFields(new String[]{"商户名*", "费用类型*", "费用属性*", "费用所属期-开始时间*", "费用所属期-结束时间*", "收款金额(元)*", "收款日期*", "截止缴款日*", "收款方式"}); | params.setImportFields(new String[]{"商户名*", "费用类型*", "费用属性*", "费用所属期-开始时间*", "费用所属期-结束时间*", "收款金额(元)*", "收款日期*", "截止缴款日*", "收款方式"}); | ||||
| @@ -94,7 +94,7 @@ public class ImportTemplateTask { | |||||
| Map<String, WxMerchant> merchantMap = new HashMap<>(); | Map<String, WxMerchant> merchantMap = new HashMap<>(); | ||||
| merchantSet.parallelStream().forEach(merchantName -> { | merchantSet.parallelStream().forEach(merchantName -> { | ||||
| WxMerchant wxMerchantQuery = new WxMerchant(); | WxMerchant wxMerchantQuery = new WxMerchant(); | ||||
| wxMerchantQuery.setTenantId(tenantId); | |||||
| wxMerchantQuery.updateTenantInfo(user); | |||||
| wxMerchantQuery.setName(merchantName); | wxMerchantQuery.setName(merchantName); | ||||
| wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); | wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); | ||||
| WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery)); | WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery)); | ||||
| @@ -139,7 +139,7 @@ public class ImportTemplateTask { | |||||
| try { | try { | ||||
| billSuccessList.stream().forEach(bill -> { | billSuccessList.stream().forEach(bill -> { | ||||
| try { | try { | ||||
| wxBillAllService.importBill(tenantId, importKey, bill, user); | |||||
| wxBillAllService.importBill(importKey, bill, user); | |||||
| } catch (UnknownSessionException ue) { | } catch (UnknownSessionException ue) { | ||||
| logger.error("session :" + ue.getMessage()); | logger.error("session :" + ue.getMessage()); | ||||
| } | } | ||||
| @@ -152,7 +152,7 @@ public class ImportTemplateTask { | |||||
| } | } | ||||
| } | } | ||||
| public void importBillDataOther(File file, MallUserInfo user, String importKey, String tenantId) { | |||||
| public void importBillDataOther(File file, MallUserInfo user, String importKey) { | |||||
| ImportParams params = new ImportParams(); | ImportParams params = new ImportParams(); | ||||
| // 需要验证 | // 需要验证 | ||||
| params.setImportFields(new String[]{"商户名*", "费用类型*", "费用名称*", "费用所属期-开始时间*", "费用所属期-结束时间*", "实际应收金额(元)*", "收款金额(元)*", "收款日期", "截止缴款日*", "收款方式"}); | params.setImportFields(new String[]{"商户名*", "费用类型*", "费用名称*", "费用所属期-开始时间*", "费用所属期-结束时间*", "实际应收金额(元)*", "收款金额(元)*", "收款日期", "截止缴款日*", "收款方式"}); | ||||
| @@ -190,7 +190,7 @@ public class ImportTemplateTask { | |||||
| Map<String, WxMerchant> merchantMap = new HashMap<>(); | Map<String, WxMerchant> merchantMap = new HashMap<>(); | ||||
| merchantSet.parallelStream().forEach(merchantName -> { | merchantSet.parallelStream().forEach(merchantName -> { | ||||
| WxMerchant wxMerchantQuery = new WxMerchant(); | WxMerchant wxMerchantQuery = new WxMerchant(); | ||||
| wxMerchantQuery.setTenantId(tenantId); | |||||
| wxMerchantQuery.updateTenantInfo(user); | |||||
| wxMerchantQuery.setName(merchantName); | wxMerchantQuery.setName(merchantName); | ||||
| wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); | wxMerchantQuery.setStatus(EnumMerchantStatus.VALID.getCode()); | ||||
| WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery)); | WxMerchant wxMerchant = wxMerchantMapper.selectOne(new QueryWrapper(wxMerchantQuery)); | ||||
| @@ -241,7 +241,7 @@ public class ImportTemplateTask { | |||||
| try { | try { | ||||
| billSuccessList.stream().forEach(bill -> { | billSuccessList.stream().forEach(bill -> { | ||||
| try { | try { | ||||
| wxBillAllService.importBillOther(tenantId, importKey, bill, user); | |||||
| wxBillAllService.importBillOther(importKey, bill, user); | |||||
| } catch (UnknownSessionException ue) { | } catch (UnknownSessionException ue) { | ||||
| logger.error("session :" + ue.getMessage()); | logger.error("session :" + ue.getMessage()); | ||||
| } | } | ||||
| @@ -277,7 +277,7 @@ public class ImportTemplateTask { | |||||
| } | } | ||||
| @Async | @Async | ||||
| public void importMemberData(File file, MallUserInfo user, String importKey, String tenantId) { | |||||
| public void importMemberData(File file, MallUserInfo user, String importKey) { | |||||
| ImportParams params = new ImportParams(); | ImportParams params = new ImportParams(); | ||||
| // 需要验证 | // 需要验证 | ||||
| params.setImportFields(new String[]{"姓名", "性别", "手机号*", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "标签", "成长值", "积分"}); | params.setImportFields(new String[]{"姓名", "性别", "手机号*", "微信昵称", "学历", "生日", "地址", "上次活跃时间", "注册时间", "标签", "成长值", "积分"}); | ||||
| @@ -325,7 +325,7 @@ public class ImportTemplateTask { | |||||
| try { | try { | ||||
| successList.parallelStream().forEach(uBase -> { | successList.parallelStream().forEach(uBase -> { | ||||
| try { | try { | ||||
| wxCUserBasicInfoService.importOneMem(tenantId, importKey, tagList, uBase, user); | |||||
| wxCUserBasicInfoService.importOneMem(importKey, tagList, uBase, user); | |||||
| } catch (UnknownSessionException ue) { | } catch (UnknownSessionException ue) { | ||||
| logger.error("session :" + ue.getMessage()); | logger.error("session :" + ue.getMessage()); | ||||
| } | } | ||||
| @@ -348,7 +348,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { | public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { | ||||
| logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportTemplate"); | logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::exportTemplate"); | ||||
| wxCUserBasicInfoService.exportTemplate(request, response, getTenantId()); | |||||
| wxCUserBasicInfoService.exportTemplate(request, response); | |||||
| } | } | ||||
| @@ -201,7 +201,7 @@ public class WxBillDailyController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| billDailyAsyncTask.importExcelData(lFile, user, importKey, tenantId); | |||||
| billDailyAsyncTask.importExcelData(lFile, user, importKey); | |||||
| return new ResultData(Result.SUCCESS, "模板正在导入"); | return new ResultData(Result.SUCCESS, "模板正在导入"); | ||||
| } | } | ||||
| @@ -135,13 +135,13 @@ public class WxImportTemplateController extends BaseController { | |||||
| } | } | ||||
| } | } | ||||
| if (type.equals(EnumImportType.MEMBER.getCode())) { | if (type.equals(EnumImportType.MEMBER.getCode())) { | ||||
| importTemplateTask.importMemberData(lFile, user, importKey, tenantId); | |||||
| importTemplateTask.importMemberData(lFile, user, importKey); | |||||
| } else if (type.equals(EnumImportType.SHOP_RENT.getCode()) || type.equals(EnumImportType.POINT_RENT.getCode()) | } else if (type.equals(EnumImportType.SHOP_RENT.getCode()) || type.equals(EnumImportType.POINT_RENT.getCode()) | ||||
| || type.equals(EnumImportType.SHOP_PROPERTY.getCode()) || type.equals(EnumImportType.POINT_PROPERTY.getCode())) { | || type.equals(EnumImportType.SHOP_PROPERTY.getCode()) || type.equals(EnumImportType.POINT_PROPERTY.getCode())) { | ||||
| importTemplateTask.importBillData(lFile, user, importKey, tenantId); | |||||
| importTemplateTask.importBillData(lFile, user, importKey); | |||||
| } else if (type.equals(EnumImportType.DAILY.getCode()) || type.equals(EnumImportType.OTHER.getCode()) | } else if (type.equals(EnumImportType.DAILY.getCode()) || type.equals(EnumImportType.OTHER.getCode()) | ||||
| || type.equals(EnumImportType.OTHER_DEPOSIT.getCode())) { | || type.equals(EnumImportType.OTHER_DEPOSIT.getCode())) { | ||||
| importTemplateTask.importBillDataOther(lFile, user, importKey, tenantId); | |||||
| importTemplateTask.importBillDataOther(lFile, user, importKey); | |||||
| } | } | ||||
| return new ResultData(Result.SUCCESS, "模板正在导入"); | return new ResultData(Result.SUCCESS, "模板正在导入"); | ||||
| } | } | ||||
| @@ -78,8 +78,8 @@ public interface WxBillAllService { | |||||
| void exportTemplate(WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response); | void exportTemplate(WxBillExcelTemplate wxBillExcelTemplate, HttpServletRequest request, HttpServletResponse response); | ||||
| void importBill(String tenantId, String importKey, WxBillExcelTemplate bill, MallUserInfo user); | |||||
| void importBill(String importKey, WxBillExcelTemplate bill, MallUserInfo user); | |||||
| void importBillOther(String tenantId, String importKey, WxBillExcelTemplateOther bill, MallUserInfo user); | |||||
| void importBillOther(String importKey, WxBillExcelTemplateOther bill, MallUserInfo user); | |||||
| } | } | ||||
| @@ -116,9 +116,9 @@ public interface WxCUserBasicInfoService { | |||||
| void exportData(WxCUserBasicInfo basicInfo, HttpServletRequest request, HttpServletResponse response); | void exportData(WxCUserBasicInfo basicInfo, HttpServletRequest request, HttpServletResponse response); | ||||
| void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId); | |||||
| void exportTemplate(HttpServletRequest request, HttpServletResponse response); | |||||
| void importOneMem(String tenantId, String importKey, List<WxTags> tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo); | |||||
| void importOneMem(String importKey, List<WxTags> tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo); | |||||
| long findCount(WxCUserBasicInfoDto dto); | long findCount(WxCUserBasicInfoDto dto); | ||||
| List<UserCountVo> findCountHistory(WxCUserBasicInfoDto dto); | List<UserCountVo> findCountHistory(WxCUserBasicInfoDto dto); | ||||
| @@ -3,6 +3,7 @@ package com.iformall.service; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.vo.PromotionCalc; | import com.iformall.domain.vo.PromotionCalc; | ||||
| import com.iformall.domain.vo.WxCardSpendVo; | import com.iformall.domain.vo.WxCardSpendVo; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| @@ -79,10 +80,10 @@ public interface WxCardSpendService { | |||||
| /** | /** | ||||
| * 卡完结 | * 卡完结 | ||||
| * | * | ||||
| * @param tenantId | |||||
| * @param tenantEntity | |||||
| * @param cardId | * @param cardId | ||||
| */ | */ | ||||
| int finishCard(String tenantId, Long cardId); | |||||
| int finishCard(TenantEntity tenantEntity, Long cardId); | |||||
| /** | /** | ||||
| * 根据Id删除实体 | * 根据Id删除实体 | ||||
| @@ -1220,7 +1220,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void importBillOther(String tenantId, String importKey, WxBillExcelTemplateOther bill, MallUserInfo user) { | |||||
| public void importBillOther(String importKey, WxBillExcelTemplateOther bill, MallUserInfo user) { | |||||
| Integer billType = bill.getBillType(); | Integer billType = bill.getBillType(); | ||||
| long receivePay = new BigDecimal(bill.getReceivePayStr()).multiply(new BigDecimal(100)).longValueExact(); | long receivePay = new BigDecimal(bill.getReceivePayStr()).multiply(new BigDecimal(100)).longValueExact(); | ||||
| long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | long pay = new BigDecimal(bill.getPayStr()).multiply(new BigDecimal(100)).longValueExact(); | ||||
| @@ -1236,7 +1236,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| if (billAttrStr.equals(EnumBillExcelTemplateDaily.AIR_CONDITIONING.getMessage())) { | if (billAttrStr.equals(EnumBillExcelTemplateDaily.AIR_CONDITIONING.getMessage())) { | ||||
| dailyQuery.setType(EnumBillDailyType.AIR_CONDITIONING.getCode()); | dailyQuery.setType(EnumBillDailyType.AIR_CONDITIONING.getCode()); | ||||
| } | } | ||||
| dailyQuery.setTenantId(tenantId); | |||||
| dailyQuery.updateTenantInfo(user); | |||||
| dailyQuery.setMerchantId(bill.getMerchantId()); | dailyQuery.setMerchantId(bill.getMerchantId()); | ||||
| dailyQuery.setReceiveDate(bill.getReceiveDate()); | dailyQuery.setReceiveDate(bill.getReceiveDate()); | ||||
| dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | dailyQuery.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| @@ -1261,7 +1261,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| } else { | } else { | ||||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | WxMerchantShop wxMerchantShop = new WxMerchantShop(); | ||||
| wxMerchantShop.setTenantId(tenantId); | |||||
| wxMerchantShop.updateTenantInfo(user); | |||||
| wxMerchantShop.setMerchantId(bill.getMerchantId()); | wxMerchantShop.setMerchantId(bill.getMerchantId()); | ||||
| wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| List<WxMerchantShop> select = wxMerchantShopMapper.selectList(new QueryWrapper<>(wxMerchantShop)); | List<WxMerchantShop> select = wxMerchantShopMapper.selectList(new QueryWrapper<>(wxMerchantShop)); | ||||
| @@ -1273,7 +1273,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| daily.setReceiveDate(bill.getReceiveDate()); | daily.setReceiveDate(bill.getReceiveDate()); | ||||
| daily.setPay(pay); | daily.setPay(pay); | ||||
| daily.setType(dailyQuery.getType()); | daily.setType(dailyQuery.getType()); | ||||
| daily.setTenantId(tenantId); | |||||
| daily.updateTenantInfo(user); | |||||
| daily.setMerchantId(bill.getMerchantId()); | daily.setMerchantId(bill.getMerchantId()); | ||||
| daily.setShopId(select.get(0).getShopId()); | daily.setShopId(select.get(0).getShopId()); | ||||
| daily.setRentShopType(bill.getMerchantType()); | daily.setRentShopType(bill.getMerchantType()); | ||||
| @@ -1311,7 +1311,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| } else if (billType.equals(EnumBillExcelTemplate.OTHER.getCode())) { | } else if (billType.equals(EnumBillExcelTemplate.OTHER.getCode())) { | ||||
| WxBillOther otherQuery = new WxBillOther(); | WxBillOther otherQuery = new WxBillOther(); | ||||
| otherQuery.setTenantId(tenantId); | |||||
| otherQuery.updateTenantInfo(user); | |||||
| otherQuery.setMerchantId(bill.getMerchantId()); | otherQuery.setMerchantId(bill.getMerchantId()); | ||||
| otherQuery.setReceiveDate(bill.getReceiveDate()); | otherQuery.setReceiveDate(bill.getReceiveDate()); | ||||
| otherQuery.setName(bill.getBillAttr()); | otherQuery.setName(bill.getBillAttr()); | ||||
| @@ -1339,7 +1339,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| } else { | } else { | ||||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | WxMerchantShop wxMerchantShop = new WxMerchantShop(); | ||||
| wxMerchantShop.setTenantId(tenantId); | |||||
| wxMerchantShop.updateTenantInfo(user); | |||||
| wxMerchantShop.setMerchantId(bill.getMerchantId()); | wxMerchantShop.setMerchantId(bill.getMerchantId()); | ||||
| wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| List<WxMerchantShop> select = wxMerchantShopMapper.selectList(new QueryWrapper(wxMerchantShop)); | List<WxMerchantShop> select = wxMerchantShopMapper.selectList(new QueryWrapper(wxMerchantShop)); | ||||
| @@ -1352,7 +1352,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| other.setReceivePay(receivePay); | other.setReceivePay(receivePay); | ||||
| other.setReceiveDate(bill.getReceiveDate()); | other.setReceiveDate(bill.getReceiveDate()); | ||||
| other.setPay(pay); | other.setPay(pay); | ||||
| other.setTenantId(tenantId); | |||||
| other.updateTenantInfo(user); | |||||
| other.setMerchantId(bill.getMerchantId()); | other.setMerchantId(bill.getMerchantId()); | ||||
| other.setShopId(select.get(0).getShopId()); | other.setShopId(select.get(0).getShopId()); | ||||
| other.setRentShopType(bill.getMerchantType()); | other.setRentShopType(bill.getMerchantType()); | ||||
| @@ -1375,7 +1375,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| } else if (billType.equals(EnumBillExcelTemplate.OTHER_DEPOSIT.getCode())) { | } else if (billType.equals(EnumBillExcelTemplate.OTHER_DEPOSIT.getCode())) { | ||||
| WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); | WxBillOtherDeposit otherDepositQuery = new WxBillOtherDeposit(); | ||||
| otherDepositQuery.setTenantId(tenantId); | |||||
| otherDepositQuery.updateTenantInfo(user); | |||||
| otherDepositQuery.setMerchantId(bill.getMerchantId()); | otherDepositQuery.setMerchantId(bill.getMerchantId()); | ||||
| otherDepositQuery.setReceiveDate(bill.getReceiveDate()); | otherDepositQuery.setReceiveDate(bill.getReceiveDate()); | ||||
| otherDepositQuery.setComments(bill.getBillAttr()); | otherDepositQuery.setComments(bill.getBillAttr()); | ||||
| @@ -1404,7 +1404,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| } else { | } else { | ||||
| WxMerchantShop wxMerchantShop = new WxMerchantShop(); | WxMerchantShop wxMerchantShop = new WxMerchantShop(); | ||||
| wxMerchantShop.setTenantId(tenantId); | |||||
| wxMerchantShop.updateTenantInfo(user); | |||||
| wxMerchantShop.setMerchantId(bill.getMerchantId()); | wxMerchantShop.setMerchantId(bill.getMerchantId()); | ||||
| otherDepositQuery.setReceiveDate(bill.getReceiveDate()); | otherDepositQuery.setReceiveDate(bill.getReceiveDate()); | ||||
| wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | ||||
| @@ -1418,7 +1418,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| otherDeposit.setReceivePay(receivePay); | otherDeposit.setReceivePay(receivePay); | ||||
| otherDeposit.setReceiveDate(bill.getReceiveDate()); | otherDeposit.setReceiveDate(bill.getReceiveDate()); | ||||
| otherDeposit.setPay(pay); | otherDeposit.setPay(pay); | ||||
| otherDeposit.setTenantId(tenantId); | |||||
| otherDeposit.updateTenantInfo(user); | |||||
| otherDeposit.setMerchantId(bill.getMerchantId()); | otherDeposit.setMerchantId(bill.getMerchantId()); | ||||
| otherDeposit.setShopId(select.get(0).getShopId()); | otherDeposit.setShopId(select.get(0).getShopId()); | ||||
| otherDeposit.setRentShopType(bill.getMerchantType()); | otherDeposit.setRentShopType(bill.getMerchantType()); | ||||
| @@ -1485,12 +1485,12 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void importBill(String tenantId, String importKey, WxBillExcelTemplate bill, MallUserInfo user) { | |||||
| public void importBill(String importKey, WxBillExcelTemplate bill, MallUserInfo user) { | |||||
| //租金 | //租金 | ||||
| Integer billType = bill.getBillType(); | Integer billType = bill.getBillType(); | ||||
| if (billType.equals(EnumBillExcelTemplate.SHOP_RENT.getCode()) || billType.equals(EnumBillExcelTemplate.POINT_RENT.getCode())) { | if (billType.equals(EnumBillExcelTemplate.SHOP_RENT.getCode()) || billType.equals(EnumBillExcelTemplate.POINT_RENT.getCode())) { | ||||
| WxBillRent rentQuery = new WxBillRent(); | WxBillRent rentQuery = new WxBillRent(); | ||||
| rentQuery.setTenantId(tenantId); | |||||
| rentQuery.updateTenantInfo(user); | |||||
| rentQuery.setMerchantId(bill.getMerchantId()); | rentQuery.setMerchantId(bill.getMerchantId()); | ||||
| rentQuery.setStarttime(bill.getStarttime()); | rentQuery.setStarttime(bill.getStarttime()); | ||||
| rentQuery.setEndtime(bill.getEndtime()); | rentQuery.setEndtime(bill.getEndtime()); | ||||
| @@ -1517,7 +1517,7 @@ public class WxBillAllServiceImpl implements WxBillAllService { | |||||
| } | } | ||||
| } else if (billType.equals(EnumBillExcelTemplate.SHOP_PROPERTY.getCode()) || billType.equals(EnumBillExcelTemplate.POINT_PROPERTY.getCode())) { | } else if (billType.equals(EnumBillExcelTemplate.SHOP_PROPERTY.getCode()) || billType.equals(EnumBillExcelTemplate.POINT_PROPERTY.getCode())) { | ||||
| WxBillProperty propertyQuery = new WxBillProperty(); | WxBillProperty propertyQuery = new WxBillProperty(); | ||||
| propertyQuery.setTenantId(tenantId); | |||||
| propertyQuery.updateTenantInfo(user); | |||||
| propertyQuery.setMerchantId(bill.getMerchantId()); | propertyQuery.setMerchantId(bill.getMerchantId()); | ||||
| propertyQuery.setStarttime(bill.getStarttime()); | propertyQuery.setStarttime(bill.getStarttime()); | ||||
| propertyQuery.setEndtime(bill.getEndtime()); | propertyQuery.setEndtime(bill.getEndtime()); | ||||
| @@ -10,6 +10,7 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto; | |||||
| import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; | import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; | ||||
| import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; | import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.vo.*; | import com.iformall.domain.vo.*; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| @@ -665,7 +666,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| excelService.exportExcel(list, null, "会员信息", WxCUserBasicInfoVo.class, "会员信息数据.xlsx", response, false); | excelService.exportExcel(list, null, "会员信息", WxCUserBasicInfoVo.class, "会员信息数据.xlsx", response, false); | ||||
| } | } | ||||
| public void exportTemplate(HttpServletRequest request, HttpServletResponse response, String tenantId) { | |||||
| public void exportTemplate(HttpServletRequest request, HttpServletResponse response) { | |||||
| List<WxCUserBasicInfoVo> list = new ArrayList<>(); | List<WxCUserBasicInfoVo> list = new ArrayList<>(); | ||||
| WxCUserBasicInfoVo u1 = new WxCUserBasicInfoVo(); | WxCUserBasicInfoVo u1 = new WxCUserBasicInfoVo(); | ||||
| WxCUserBasicInfoVo u2 = new WxCUserBasicInfoVo(); | WxCUserBasicInfoVo u2 = new WxCUserBasicInfoVo(); | ||||
| @@ -741,7 +742,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| } | } | ||||
| public WxCUserBasicInfo InitUserBaseInfo(CUserBaseInfoT uBase, String tenantId) { | |||||
| public WxCUserBasicInfo InitUserBaseInfo(CUserBaseInfoT uBase, TenantEntity tenantEntity) { | |||||
| if (StringUtils.isBlank(uBase.getPhone())) { | if (StringUtils.isBlank(uBase.getPhone())) { | ||||
| return null; | return null; | ||||
| } | } | ||||
| @@ -749,7 +750,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| WxCUserBasicInfo userBase = new WxCUserBasicInfo(); | WxCUserBasicInfo userBase = new WxCUserBasicInfo(); | ||||
| userBase.setTenantId(tenantId); | |||||
| userBase.updateTenantInfo(tenantEntity); | |||||
| userBase.setName(uBase.getName()); | userBase.setName(uBase.getName()); | ||||
| if (uBase.getSex() == null) { | if (uBase.getSex() == null) { | ||||
| userBase.setSex(0); | userBase.setSex(0); | ||||
| @@ -790,7 +791,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void importOneMem(String tenantId, String importKey, List<WxTags> tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo) { | |||||
| public void importOneMem(String importKey, List<WxTags> tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo) { | |||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| if (StringUtils.isBlank(uBase.getPhone())) { | if (StringUtils.isBlank(uBase.getPhone())) { | ||||
| @@ -798,7 +799,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| logger.error("手机号为空", uBase.toString()); | logger.error("手机号为空", uBase.toString()); | ||||
| return; | return; | ||||
| } | } | ||||
| WxCUserBasicInfo userBase = InitUserBaseInfo(uBase, tenantId); | |||||
| WxCUserBasicInfo userBase = InitUserBaseInfo(uBase, mallUserInfo); | |||||
| if (userBase == null) { | if (userBase == null) { | ||||
| stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); | stringRedisTemplate.opsForHash().increment(importKey, "processCount", 1); | ||||
| logger.error("userBase为null", uBase.toString()); | logger.error("userBase为null", uBase.toString()); | ||||
| @@ -831,7 +832,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| WxCUserBasicInfo oldUserBase = null; | WxCUserBasicInfo oldUserBase = null; | ||||
| WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo(); | WxCUserBasicInfo userBaseQ = new WxCUserBasicInfo(); | ||||
| userBaseQ.setTenantId(tenantId); | |||||
| userBaseQ.updateTenantInfo(mallUserInfo); | |||||
| userBaseQ.setPhone(userBase.getPhone()); | userBaseQ.setPhone(userBase.getPhone()); | ||||
| List<WxCUserBasicInfo> userBList = wxCUserBasicInfoMapper.selectList(new QueryWrapper(userBaseQ)); | List<WxCUserBasicInfo> userBList = wxCUserBasicInfoMapper.selectList(new QueryWrapper(userBaseQ)); | ||||
| if (userBList.size() > 0) { | if (userBList.size() > 0) { | ||||
| @@ -873,7 +874,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| { | { | ||||
| // check c_user 是否存在 | // check c_user 是否存在 | ||||
| WxCUser cUserQ = new WxCUser(); | WxCUser cUserQ = new WxCUser(); | ||||
| cUserQ.setTenantId(tenantId); | |||||
| cUserQ.updateTenantInfo(mallUserInfo); | |||||
| cUserQ.setPhone(userBase.getPhone()); | cUserQ.setPhone(userBase.getPhone()); | ||||
| List<WxCUser> userList = wxCUserMapper.selectList(new QueryWrapper(cUserQ)); | List<WxCUser> userList = wxCUserMapper.selectList(new QueryWrapper(cUserQ)); | ||||
| if (userList.size() > 0) { | if (userList.size() > 0) { | ||||
| @@ -955,7 +956,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| //积分处理逻辑:覆盖原积分 记录历史 | //积分处理逻辑:覆盖原积分 记录历史 | ||||
| if (credit != null) { | if (credit != null) { | ||||
| WxCreditHistory wxCreditHistory = new WxCreditHistory(); | WxCreditHistory wxCreditHistory = new WxCreditHistory(); | ||||
| wxCreditHistory.setTenantId(tenantId); | |||||
| wxCreditHistory.updateTenantInfo(mallUserInfo); | |||||
| wxCreditHistory.setCreateDate(new Date()); | wxCreditHistory.setCreateDate(new Date()); | ||||
| if (mallUserInfo != null) { | if (mallUserInfo != null) { | ||||
| wxCreditHistory.setOperatorId(mallUserInfo.getId()); | wxCreditHistory.setOperatorId(mallUserInfo.getId()); | ||||
| @@ -9,6 +9,7 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.dto.WxSharingOrderDto; | import com.iformall.domain.dto.WxSharingOrderDto; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | |||||
| import com.iformall.domain.vo.PromotionCalc; | import com.iformall.domain.vo.PromotionCalc; | ||||
| import com.iformall.domain.vo.WxCardSpendVo; | import com.iformall.domain.vo.WxCardSpendVo; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| @@ -393,7 +394,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public int finishCard(String tenantId, Long cardId) { | |||||
| public int finishCard(TenantEntity tenantEntity, Long cardId) { | |||||
| // admin用户手动帮已用卡消费用户退卡, 此卡需要分账完结, 买卡的钱进商场账户 | // admin用户手动帮已用卡消费用户退卡, 此卡需要分账完结, 买卡的钱进商场账户 | ||||
| WxCardInfo cardInfo = null; | WxCardInfo cardInfo = null; | ||||
| try { | try { | ||||
| @@ -425,7 +426,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| // 分账完结 | // 分账完结 | ||||
| WxSharingOrderDto shareOrder = new WxSharingOrderDto(); | WxSharingOrderDto shareOrder = new WxSharingOrderDto(); | ||||
| shareOrder.setCUserId(couponOrder.getOwnerId()); | shareOrder.setCUserId(couponOrder.getOwnerId()); | ||||
| shareOrder.setTenantId(tenantId); | |||||
| shareOrder.updateTenantInfo(tenantEntity); | |||||
| shareOrder.setMerchantId(0L); // 卡完结,默认给0 | shareOrder.setMerchantId(0L); // 卡完结,默认给0 | ||||
| shareOrder.setTransactionId(cardInfo.getTransactionId()); | shareOrder.setTransactionId(cardInfo.getTransactionId()); | ||||
| cardShareFinished(cardInfo, shareOrder); | cardShareFinished(cardInfo, shareOrder); | ||||
| @@ -60,7 +60,7 @@ public class SystemLogAspect { | |||||
| " ip:" + ipaddress); | " ip:" + ipaddress); | ||||
| MallUserAction action = new MallUserAction(); | MallUserAction action = new MallUserAction(); | ||||
| action.setTenantId(user.getTenantId()); | |||||
| action.updateTenantInfo(user); | |||||
| action.setType(EnumMallUserAction.CONTROLLER.getCode()); | action.setType(EnumMallUserAction.CONTROLLER.getCode()); | ||||
| action.setIp(ipaddress); | action.setIp(ipaddress); | ||||
| action.setUserId(user.getId()); | action.setUserId(user.getId()); | ||||