Kaynağa Gözat

[getUser][修改]:重整

release_toaliyun_real
Stormeye Wu 7 yıl önce
ebeveyn
işleme
599a881721
14 değiştirilmiş dosya ile 88 ekleme ve 73 silme
  1. +0
    -11
      mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
  2. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java
  3. +7
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  4. +15
    -10
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java
  5. +10
    -11
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java
  6. +3
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java
  7. +4
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java
  8. +3
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java
  9. +1
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java
  10. +9
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  11. +8
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java
  12. +8
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java
  13. +8
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java
  14. +12
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java

+ 0
- 11
mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java Dosyayı Görüntüle

@@ -8,10 +8,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.WxAppinfo;
<<<<<<< HEAD:mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java
import com.iformall.exception.MallinkException;
=======
>>>>>>> [controller][修改]:按照功能分类,分别放到不同的路径下:mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
import com.iformall.service.WxAppinfoService;
import com.iformall.service.wechat.FmOpenService;
import com.iformall.utils.Constant;
@@ -22,7 +19,6 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,7 +46,6 @@ public class WxAppinfoController extends BaseController {
@Autowired
private FmOpenService openService;

<<<<<<< HEAD:mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@@ -101,12 +96,6 @@ public class WxAppinfoController extends BaseController {
@ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}")
@PostMapping("/downQrCode")
public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) throws MallinkException {
=======
@ApiOperation(value = "下载二维码", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}")
@PostMapping("/downQrCode")
@RequiresPermissions("app:qr:download")
public ResultData downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map<String, Object> params) {
>>>>>>> [controller][修改]:按照功能分类,分别放到不同的路径下:mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
logger.debug("[" + getIpAddr() + "] WxAppinfoController::downQrCode");
String name = (String) params.get("name");
String pageUrl = (String) params.get("pageUrl");


+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java Dosyayı Görüntüle

@@ -194,7 +194,6 @@ public class WxCarController extends BaseController {
logger.info(coupon.toString());
// Save to wx_counpon
Date curDate = new Date();
MallUserInfo user = getUser();
// check 同一个模板的券分配额是否超了
if (StringUtils.isBlank(coupon.getVendorParams())) {
logger.error("请填充停车厂商优免券参数");


+ 7
- 4
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java Dosyayı Görüntüle

@@ -3,6 +3,7 @@ package com.iformall.controller.contract;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillProperty;
import com.iformall.domain.po.WxPropertyContract;
import com.iformall.service.WxBillPropertyService;
@@ -48,15 +49,17 @@ public class WxPropertyContractController extends BaseController {
@PostMapping("add")
public ResultData add(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::add");
wxPropertyContract.setTenantId(getTenantId());
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, getUser().getId(), getUser().getName());
MallUserInfo user = getUser();
wxPropertyContract.setTenantId(user.getTenantId());
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName());
}

@PostMapping("update")
public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update");
wxPropertyContract.setTenantId(getTenantId());
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, getUser().getId(), getUser().getName());
MallUserInfo user = getUser();
wxPropertyContract.setTenantId(user.getTenantId());
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName());
}

@GetMapping("/del")


+ 15
- 10
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Dosyayı Görüntüle

@@ -5,13 +5,13 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillRent;
import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxRentContract;
import com.iformall.domain.po.WxShop;
import com.iformall.enums.EnumRentContractAdjustPeriod;
import com.iformall.enums.EnumRentShopType;
import com.iformall.enums.EnumShopType;
import com.iformall.service.WxBillRentService;
import com.iformall.service.WxPayAccountBillService;
import com.iformall.service.WxRentContractService;
@@ -65,7 +65,9 @@ public class WxRentContractController extends BaseController {
@SystemControllerLog(description = "租赁合同-添加")
public ResultData add(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::add");
wxRentContract.setTenantId(getTenantId());

MallUserInfo user = getUser();
wxRentContract.setTenantId(user.getTenantId());

//目前只有多经点位租赁合同
WxShop wxShop = wxShopService.getById(wxRentContract.getShopId());
@@ -73,49 +75,52 @@ public class WxRentContractController extends BaseController {
&& EnumRentShopType.POINT.getCode().equals(wxShop.getType())){
wxRentContract.setAdjustPeriod(wxRentContract.getMonthHandleType());
}
return wxRentContractService.save(wxRentContract, getUser().getId(),getUser().getName());
return wxRentContractService.save(wxRentContract, user.getId(),user.getName());
}

@PostMapping("update")
@SystemControllerLog(description = "租赁合同-更新")
public ResultData update(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::update");
wxRentContract.setTenantId(getTenantId());
MallUserInfo user = getUser();
wxRentContract.setTenantId(user.getTenantId());
//目前只有多经点位租赁合同
WxShop wxShop = wxShopService.getById(wxRentContract.getShopId());
if(wxRentContract.getMonthHandleType() != null && EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode().equals(wxRentContract.getMonthHandleType().intValue())
&& EnumRentShopType.POINT.getCode().equals(wxShop.getType())){
wxRentContract.setAdjustPeriod(wxRentContract.getMonthHandleType());
}
return wxRentContractService.update(wxRentContract, getUser().getId(),getUser().getName());
return wxRentContractService.update(wxRentContract, user.getId(),user.getName());
}

@PostMapping("updateMoney")
@SystemControllerLog(description = "租赁合同-更新金额")
public ResultData updateMoney(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateMoney");
wxRentContract.setTenantId(getTenantId());
MallUserInfo user = getUser();
wxRentContract.setTenantId(user.getTenantId());
//目前只有多经点位租赁合同
WxShop wxShop = wxShopService.getById(wxRentContract.getShopId());
if(wxRentContract.getMonthHandleType() != null &&EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode().equals(wxRentContract.getMonthHandleType().intValue())
&& EnumRentShopType.POINT.getCode().equals(wxShop.getType())){
wxRentContract.setAdjustPeriod(wxRentContract.getMonthHandleType());
}
return wxRentContractService.update(wxRentContract, getUser().getId(),getUser().getName());
return wxRentContractService.update(wxRentContract, user.getId(),user.getName());
}

@PostMapping("updateFile")
@SystemControllerLog(description = "租赁合同-更新文件")
public ResultData updateFile(@RequestBody WxRentContract wxRentContract) {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateFile");
wxRentContract.setTenantId(getTenantId());
MallUserInfo user = getUser();
wxRentContract.setTenantId(user.getTenantId());
//目前只有多经点位租赁合同
WxShop wxShop = wxShopService.getById(wxRentContract.getShopId());
if(wxRentContract.getMonthHandleType() != null && EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode().equals(wxRentContract.getMonthHandleType().intValue())
&& EnumRentShopType.POINT.getCode().equals(wxShop.getType())){
wxRentContract.setAdjustPeriod(wxRentContract.getMonthHandleType());
}
return wxRentContractService.updateFile(wxRentContract, getUser().getId(),getUser().getName());
return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName());
}

@GetMapping("/del")
@@ -133,7 +138,7 @@ public class WxRentContractController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxRentContractController::findById");
// 同步欠缴状态
WxBillRent wxBillRent = new WxBillRent();
wxBillRent.setTenantId(super.getTenantId());
wxBillRent.setTenantId(getTenantId());
wxBillRentService.updateBillStatus(wxBillRent);
return wxRentContractService.getById(id);
}


+ 10
- 11
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java Dosyayı Görüntüle

@@ -66,8 +66,7 @@ public class WxCardPayController extends BaseController {
wxCardVo.setOuPhone(null);
}
}
MallUserInfo user = getUser();
wxCardVo.setTenantId(user.getTenantId());
wxCardVo.setTenantId(getTenantId());
if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) {
String [] statusAttr = wxCardVo.getStatusStr().split(",");
List<Integer> tmpList = new ArrayList<Integer>();
@@ -94,8 +93,7 @@ public class WxCardPayController extends BaseController {
if (wxCardSpendVo == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空");
}
MallUserInfo user = getUser();
wxCardSpendVo.setTenantId(user.getTenantId());
wxCardSpendVo.setTenantId(getTenantId());
if(StringUtils.isNotBlank(wxCardSpendVo.getPayStatusStr())) {
String [] statusAttr = wxCardSpendVo.getPayStatusStr().split(",");
List<Integer> tmpList = new ArrayList<Integer>();
@@ -119,8 +117,7 @@ public class WxCardPayController extends BaseController {
if (wxCardSpend == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空");
}
MallUserInfo user = getUser();
wxCardSpend.setTenantId(user.getTenantId());
wxCardSpend.setTenantId(getTenantId());
final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend);
return new ResultData(mapList);
}
@@ -156,8 +153,7 @@ public class WxCardPayController extends BaseController {
if (wxCardSpend == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空");
}
MallUserInfo user = getUser();
wxCardSpend.setTenantId(user.getTenantId());
wxCardSpend.setTenantId(getTenantId());
wxCardSpendService.update(wxCardSpend);
return new ResultData();
}
@@ -171,9 +167,12 @@ public class WxCardPayController extends BaseController {
if (wxCardInfo == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空");
}
MallUserInfo user = getUser();
wxCardInfo.setTenantId(user.getTenantId());
int remainShareAmount = wxCardSpendService.finishCard(user.getTenantId(), wxCardInfo.getId());
if (wxCardInfo.getId() == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件ID为空");
}
String tenantId = getTenantId();
wxCardInfo.setTenantId(tenantId);
int remainShareAmount = wxCardSpendService.finishCard(tenantId, wxCardInfo.getId());
return new ResultData(remainShareAmount);
}
}

+ 3
- 4
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java Dosyayı Görüntüle

@@ -50,7 +50,7 @@ public class WxCouponChannelController extends BaseController {
if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) {
wxCouponChannel.setStatus(null);
}
wxCouponChannel.setTenantId(getUser().getTenantId());
wxCouponChannel.setTenantId(getTenantId());
wxCouponChannel.setSortColumns(WxCouponChannel.Field.UpdateDate_DESC);
final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize);
return new ResultData(page);
@@ -62,7 +62,7 @@ public class WxCouponChannelController extends BaseController {
@SystemControllerLog(description = "券投放-更新")
public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) {
logger.debug("[" + getIpAddr() + "] WxCouponChannelController::update");
wxCouponChannel.setTenantId(getUser().getTenantId());
wxCouponChannel.setTenantId(getTenantId());

return wxCouponChannelService.saveOrUpdate(wxCouponChannel);
}
@@ -93,8 +93,7 @@ public class WxCouponChannelController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxCouponChannelController::addbatch");
String[] ids = wxCouponChannelDto.getCouponIds().split(",");
String[] channelId = wxCouponChannelDto.getChannelId().split(",");
MallUserInfo user = getUser();
return wxCouponChannelService.addBatch(ids, channelId, user.getTenantId(), wxCouponChannelDto.getBeginTime(), wxCouponChannelDto.getEndTime());
return wxCouponChannelService.addBatch(ids, channelId, getTenantId(), wxCouponChannelDto.getBeginTime(), wxCouponChannelDto.getEndTime());
}

@ApiOperation("根据id查询接口")


+ 4
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java Dosyayı Görüntüle

@@ -6,6 +6,7 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxCouponInject;
import com.iformall.service.WxCouponInjectService;
import com.iformall.service.WxCUserTagsService;
@@ -56,8 +57,9 @@ public class WxCouponInjectController extends BaseController {
public ResultData add(@RequestBody WxCouponInject couponInject) {
logger.debug("[" + getIpAddr() + "] WxCouponInjectController::add");

couponInject.setTenantId(getUser().getTenantId());
couponInject.setMUserId(getUser().getId());
MallUserInfo user = getUser();
couponInject.setTenantId(user.getTenantId());
couponInject.setMUserId(user.getId());

return wxCouponInjectService.add(couponInject);
}


+ 3
- 6
mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java Dosyayı Görüntüle

@@ -46,8 +46,7 @@ public class WxMerchantSubsidyController extends BaseController {
if (wxMerchantSubsidy == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空");
}
MallUserInfo user = getUser();
wxMerchantSubsidy.setTenantId(user.getTenantId());
wxMerchantSubsidy.setTenantId(getTenantId());
if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) {
String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(",");
List<Integer> tmpList = new ArrayList<Integer>();
@@ -74,8 +73,7 @@ public class WxMerchantSubsidyController extends BaseController {
if (wxMerchantSubsidy == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空");
}
MallUserInfo user = getUser();
wxMerchantSubsidy.setTenantId(user.getTenantId());
wxMerchantSubsidy.setTenantId(getTenantId());
if(StringUtils.isNotBlank(wxMerchantSubsidy.getStatusStr())) {
String [] statusAttr = wxMerchantSubsidy.getStatusStr().split(",");
List<Integer> tmpList = new ArrayList<Integer>();
@@ -100,8 +98,7 @@ public class WxMerchantSubsidyController extends BaseController {
if (wxMerchantSubsidy == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空");
}
MallUserInfo user = getUser();
wxMerchantSubsidy.setTenantId(user.getTenantId());
wxMerchantSubsidy.setTenantId(getTenantId());
wxMerchantSubsidy.setStatus(EnumMerchantSubsidyStatus.MANUAL_SUBSIDIED.getCode());
wxMerchantSubsidy.setUpdateDate(new Date());
if(StringUtils.isNotBlank(wxMerchantSubsidy.getIdStr())) {


+ 1
- 2
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java Dosyayı Görüntüle

@@ -161,10 +161,9 @@ public class WxCUserBasicInfoController extends BaseController {
@SystemControllerLog(description = "会员管理-更新")
public ResultData update(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) {
logger.debug("[" + getIpAddr() + "] WxCUserBasicInfoController::update");
MallUserInfo currentUser = getUser();
WxCUserBasicInfo oldInfo = wxCUserBasicInfoService.getById(wxCUserBasicInfo.getId());
if (!oldInfo.getPhone().equals(wxCUserBasicInfo.getPhone())) {
if (checkUniquePhone(wxCUserBasicInfo.getPhone(), currentUser.getTenantId()) > 0) {
if (checkUniquePhone(wxCUserBasicInfo.getPhone(), getTenantId()) > 0) {
return new ResultData(ErrorCode.USER_PHONE_IS_FOUND.getCode(), "手机号已存在");
}
}


+ 9
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java Dosyayı Görüntüle

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxCreditHistory;
import com.iformall.domain.vo.WxCreditHistoryVo;
import com.iformall.exception.MallinkException;
@@ -51,6 +52,7 @@ public class WxCreditHistoryController extends BaseController
@PostMapping("add")
public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) {
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add");
<<<<<<< HEAD
wxCreditHistory.setTenantId(getTenantId());
wxCreditHistory.setOperatorId(getUser().getId());
try {
@@ -60,6 +62,13 @@ public class WxCreditHistoryController extends BaseController
logger.error(e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
}
=======
MallUserInfo user = getUser();
wxCreditHistory.setTenantId(user.getTenantId());
wxCreditHistory.setOperatorId(user.getId());
WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
return new ResultData(Result.SUCCESS,"操作成功",credit);
>>>>>>> [getUser][修改]:重整
}

@ApiOperation("根据id查询接口")


+ 8
- 5
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java Dosyayı Görüntüle

@@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillDaily;
import com.iformall.service.WxBillDailyService;
import io.swagger.annotations.ApiImplicitParam;
@@ -46,17 +47,19 @@ public class WxBillDailyController extends BaseController {
@SystemControllerLog(description = "日常账单-新增")
public ResultData add(@RequestBody WxBillDaily wxBillDaily) {
logger.debug("[" + getIpAddr() + "] WxBillDailyController::add");
wxBillDaily.setTenantId(getTenantId());
wxBillDaily.setUserId(getUser().getId());
return wxBillDailyService.saveOrUpdate(wxBillDaily, getUser());
MallUserInfo user = getUser();
wxBillDaily.setTenantId(user.getTenantId());
wxBillDaily.setUserId(user.getId());
return wxBillDailyService.saveOrUpdate(wxBillDaily, user);
}

@PostMapping("update")
@SystemControllerLog(description = "日常账单-更新")
public ResultData update(@RequestBody WxBillDaily wxBillDaily) {
logger.debug("[" + getIpAddr() + "] WxBillDailyController::update");
wxBillDaily.setUserId(getUser().getId());
return wxBillDailyService.saveOrUpdate(wxBillDaily, getUser());
MallUserInfo user = getUser();
wxBillDaily.setUserId(user.getId());
return wxBillDailyService.saveOrUpdate(wxBillDaily, user);
}

@GetMapping("/del")


+ 8
- 5
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java Dosyayı Görüntüle

@@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillOther;
import com.iformall.service.WxBillOtherService;
import io.swagger.annotations.ApiImplicitParam;
@@ -46,17 +47,19 @@ public class WxBillOtherController extends BaseController {
@SystemControllerLog(description = "其它账单-新增")
public ResultData add(@RequestBody WxBillOther wxBillOther) {
logger.debug("[" + getIpAddr() + "] WxBillOtherController::add");
wxBillOther.setTenantId(getTenantId());
wxBillOther.setUserId(getUser().getId());
return wxBillOtherService.saveOrUpdate(wxBillOther, getUser());
MallUserInfo user = getUser();
wxBillOther.setTenantId(user.getTenantId());
wxBillOther.setUserId(user.getId());
return wxBillOtherService.saveOrUpdate(wxBillOther, user);
}

@PostMapping("update")
@SystemControllerLog(description = "其它账单-更新")
public ResultData update(@RequestBody WxBillOther wxBillOther) {
logger.debug("[" + getIpAddr() + "] WxBillOtherController::update");
wxBillOther.setUserId(getUser().getId());
return wxBillOtherService.saveOrUpdate(wxBillOther, getUser());
MallUserInfo user = getUser();
wxBillOther.setUserId(user.getId());
return wxBillOtherService.saveOrUpdate(wxBillOther, user);
}

@GetMapping("/del")


+ 8
- 5
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java Dosyayı Görüntüle

@@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.Result;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillOtherDeposit;
import com.iformall.service.WxBillOtherDepositService;
import io.swagger.annotations.ApiImplicitParam;
@@ -46,17 +47,19 @@ public class WxBillOtherDepositController extends BaseController {
@SystemControllerLog(description = "其它账单-新增")
public ResultData add(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::add");
wxBillOtherDeposit.setTenantId(getTenantId());
wxBillOtherDeposit.setUserId(getUser().getId());
return wxBillOtherDepositService.saveOrUpdate(wxBillOtherDeposit, getUser());
MallUserInfo user = getUser();
wxBillOtherDeposit.setTenantId(user.getTenantId());
wxBillOtherDeposit.setUserId(user.getId());
return wxBillOtherDepositService.saveOrUpdate(wxBillOtherDeposit, user);
}

@PostMapping("update")
@SystemControllerLog(description = "其它账单-更新")
public ResultData update(@RequestBody WxBillOtherDeposit wxBillOtherDeposit) {
logger.debug("[" + getIpAddr() + "] WxBillOtherDepositController::update");
wxBillOtherDeposit.setUserId(getUser().getId());
return wxBillOtherDepositService.saveOrUpdate(wxBillOtherDeposit, getUser());
MallUserInfo user = getUser();
wxBillOtherDeposit.setUserId(user.getId());
return wxBillOtherDepositService.saveOrUpdate(wxBillOtherDeposit, user);
}

@GetMapping("/del")


+ 12
- 7
mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java Dosyayı Görüntüle

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxFlowRecord;
import com.iformall.enums.EnumFlowRecordStatus;
import com.iformall.service.WxFlowService;
@@ -35,7 +36,8 @@ public class WxFlowAbleController extends BaseController {
@SystemControllerLog(description = "工作流-启动流程")
public ResultData start(@RequestBody Map<String, Object> params) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::start");
return wxFlowService.start(params,super.getUser().getId(),super.getUser().getName(),super.getTenantId());
MallUserInfo user = getUser();
return wxFlowService.start(params, user.getId(),user.getName(),user.getTenantId());
}

/**
@@ -64,7 +66,7 @@ public class WxFlowAbleController extends BaseController {
@SystemControllerLog(description = "工作流-用户代办列表")
public ResultData list(String flowType,Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::list");
return wxFlowService.list(flowType,pageNum,pageSize,super.getUser().getId());
return wxFlowService.list(flowType,pageNum,pageSize,getUserId());
}

/**
@@ -79,7 +81,7 @@ public class WxFlowAbleController extends BaseController {
@SystemControllerLog(description = "工作流-我的申请列表")
public ResultData myApplyList(@ModelAttribute WxFlowRecord record, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::myApplyList");
record.setUserId(super.getUser().getId());
record.setUserId(getUserId());
record.setStatus(EnumFlowRecordStatus.NEW.getCode());

PageInfo<WxFlowRecord> pageInfo = wxFlowService.listAsPage(record,pageNum,pageSize);
@@ -104,7 +106,7 @@ public class WxFlowAbleController extends BaseController {
@SystemControllerLog(description = "工作流-我的审批列表")
public ResultData myHandleList(@ModelAttribute WxFlowRecord record, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] FlowAbleController::myHandelList");
record.setUserId(super.getUser().getId());
record.setUserId(getUserId());
record.setStatus(EnumFlowRecordStatus.NEW.getCode());
PageInfo<WxFlowRecord> pageInfo = wxFlowService.myHandelList(record,pageNum,pageSize);
List<WxFlowRecord> recordList = pageInfo.getList();
@@ -151,7 +153,8 @@ public class WxFlowAbleController extends BaseController {
@ApiOperation(value = "审批",notes = "{\"taskId\":\"\",\"processInstanceId\":\"\",\"remark\":\"\"}")
@PostMapping(value = "apply")
public ResultData apply(@RequestBody Map<String, String> params) {
return wxFlowService.apply(params,super.getUser().getId(),super.getUser().getName(),super.getTenantId());
MallUserInfo user = getUser();
return wxFlowService.apply(params,user.getId(),user.getName(),user.getTenantId());
}

/**
@@ -161,7 +164,8 @@ public class WxFlowAbleController extends BaseController {
@PostMapping(value = "reject")
@SystemControllerLog(description = "工作流-驳回")
public ResultData reject(@RequestBody Map<String, Object> params) {
return wxFlowService.reject(params,super.getUser().getId(),super.getUser().getName(),super.getUser().getPhone(),super.getTenantId());
MallUserInfo user = getUser();
return wxFlowService.reject(params,user.getId(),user.getName(),user.getPhone(),user.getTenantId());
}


@@ -172,7 +176,8 @@ public class WxFlowAbleController extends BaseController {
@PostMapping(value = "setBack")
@SystemControllerLog(description = "工作流-撤回")
public ResultData setBack(@RequestBody Map<String, Object> params) {
return wxFlowService.setBack(params,super.getUser().getId(),super.getUser().getName());
MallUserInfo user = getUser();
return wxFlowService.setBack(params,user.getId(),user.getName());
}

/**


Yükleniyor…
İptal
Kaydet