From a6251f6bb3ca1513149bf3a8ae12b9a98d64e317 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 2 Jun 2021 18:17:59 +0800 Subject: [PATCH] tt --- .../java/com/iformall/domain/po/WxMall.java | 27 +++++++++ .../com/iformall/domain/po/tt/TtCoupon.java | 2 +- .../com/iformall/mapper/WxMallMapper.java | 5 +- .../com/iformall/service/WxMallService.java | 2 + .../service/impl/WxBillAllServiceImpl.java | 12 ++-- .../service/impl/WxMallServiceImpl.java | 6 ++ .../iformall/service/tt/TtCouponService.java | 2 +- .../service/tt/impl/TtCouponServiceImpl.java | 4 +- .../main/resources/mapper/WxMallMapper.xml | 56 +++++++++++++++++-- .../controller/base/BaseController.java | 2 +- .../controller/basic/WxMallController.java | 21 +++++++ .../controller/tt/TtCouponController.java | 2 +- 12 files changed, 125 insertions(+), 16 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 6598022c2..25480e5f8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -160,4 +160,31 @@ public class WxMall extends TenantEntity { } } + @io.swagger.annotations.ApiModelProperty(value="管理员姓名",name="adminName") + @TableField(exist = false) + private Long adminId; + + @io.swagger.annotations.ApiModelProperty(value="管理员姓名",name="adminName") + @TableField(exist = false) + private String adminName; + + @io.swagger.annotations.ApiModelProperty(value="管理员电话",name="adminPhone") + @TableField(exist = false) + private String adminPhone; + + @io.swagger.annotations.ApiModelProperty(value="管理员登陆帐号",name="adminUsername") + @TableField(exist = false) + private String adminUsername; + + @io.swagger.annotations.ApiModelProperty(value="管理员登陆密码",name="adminPassword") + private String adminPassword; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startTime") + private Date startTime; + + @TableField(exist = false) + @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="endTime") + private Date endTime; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java index 40998e5ec..3d3fd1002 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java @@ -96,7 +96,7 @@ public class TtCoupon extends TenantEntity { private String dyTitle; @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") private Integer inventory; - @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") + @io.swagger.annotations.ApiModelProperty(value="备注",name="remark") private String remark; @io.swagger.annotations.ApiModelProperty(value="状态",name="status") private Integer status; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java index 6afafd1e9..c5f8e8fc2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java @@ -3,6 +3,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMall; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.plugin.autoTenantId.TenantInfo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -13,7 +14,7 @@ public interface WxMallMapper extends CommonMapper { WxMall getByTenantId(String tenantId); - WxMall getByTenantInfo(WxMall wxMall); + WxMall getByTenantInfo(TenantEntity tenantEntity); String queryMenusByTenantId(String tenantId); @@ -24,4 +25,6 @@ public interface WxMallMapper extends CommonMapper { List listAsSelectMall(@Param(value = "id")Long id); List getTenantEntitys(TenantEntity tenantEntity); + + List findListAadmin(WxMall record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java index 0b9f59408..8525c6431 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java @@ -84,4 +84,6 @@ public interface WxMallService { List listAsSelectMall(Long id); List getTenantEntitys(TenantEntity tenantEntity); + + PageInfo listAadminAsPage(WxMall wxMall, Integer pageNum, Integer pageSize); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 24a6c4622..7bdf1e13d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -736,9 +736,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { @Override public void exportOweBill(WxBillAll wxBillAll, HttpServletRequest request, HttpServletResponse response) { //商场名称 - WxMall q = new WxMall(); - q.setTenantInfo(wxBillAll); - WxMall wxMall = wxMallMapper.getByTenantInfo(q); +// WxMall q = new WxMall(); +// q.setTenantInfo(wxBillAll); + WxMall wxMall = wxMallMapper.getByTenantInfo(wxBillAll); //映射结果 Map result = new HashMap<>(); result.put("mall", wxMall.getName()); @@ -900,9 +900,9 @@ public class WxBillAllServiceImpl implements WxBillAllService { //映射结果 Map result = new HashMap<>(); - WxMall q = new WxMall(); - q.setTenantInfo(wxBillSettle); - WxMall wxMall = wxMallMapper.getByTenantInfo(q); +// WxMall q = new WxMall(); +// q.setTenantInfo(wxBillSettle); + WxMall wxMall = wxMallMapper.getByTenantInfo(wxBillSettle); result.put("mall", wxMall.getName()); result.put("merchant", wxMerchantMapper.selectById(wxBillSettle.getMerchantId()).getName()); result.put("num", wxBillSettle.getSettleNumber()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 3d0b2f872..806440e30 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -253,4 +253,10 @@ public class WxMallServiceImpl implements WxMallService { } } + @Override + public PageInfo listAadminAsPage(WxMall record, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxMallMapper.findListAadmin(record)); + + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java b/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java index b5259745b..324aa95e5 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/TtCouponService.java @@ -56,7 +56,7 @@ public interface TtCouponService { ResultData auditPass(Long id); - ResultData auditRejected(Long id); + ResultData auditRejected(Long id,String remark); int addSeeCount(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java index bb70541d2..2b34f6cc8 100644 --- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtCouponServiceImpl.java @@ -245,13 +245,14 @@ public class TtCouponServiceImpl implements TtCouponService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不在审核中"); } byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_BEFOR_SHELF.getCode()); + byId.setRemark(""); byId.setUpdateDate(new Date()); ttCouponMapper.updateById(byId); return new ResultData(); } @Override - public ResultData auditRejected(Long id) { + public ResultData auditRejected(Long id,String remark) { TtCoupon byId = this.getById(id); if(byId == null){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"未找到课程"); @@ -260,6 +261,7 @@ public class TtCouponServiceImpl implements TtCouponService { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"此课程状态不在审核中"); } byId.setStatus(EnumTtCouponStatus.TTCOUPON_STATUS_REJECT.getCode()); + byId.setRemark(remark); byId.setUpdateDate(new Date()); ttCouponMapper.updateById(byId); return new ResultData(); diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index 9caf7fd58..40e6f0c39 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -40,6 +40,12 @@ + + + + + + @@ -52,7 +58,7 @@ - where 1=1 + where id > 1 and `id` = #{id} @@ -151,7 +157,6 @@ from wx_mall - and id > 1 @@ -170,11 +175,17 @@ from wx_mall where `tenant_id` = #{value} - select from wx_mall - + where 1=1 + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + + diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 990908771..0f11f0f13 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -143,7 +143,7 @@ public class BaseController { info.setTenantId(info.getParentTenantId()); info.setParentTenantId(null); - if(getUser().getParentTenantId().equals(info.getTenantId())){ + if(getUser().getTenantId().equals(info.getTenantId())){ return info; } } diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index 4030ffe15..1fa3a3d05 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -1,6 +1,9 @@ package com.iformall.controller.basic; +import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; +import com.iformall.annotation.TenantIgnore; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMall; @@ -19,6 +22,24 @@ public class WxMallController extends BaseController { @Autowired private WxMallService wxMallService; + @ApiOperation("查询商场集团列表") + @GetMapping(value = "/listAadmin") + @SystemControllerLog(description = "商场基础数据") + public ResultData getlistAadmin(@ModelAttribute WxMall wxMall, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxProjectConfigController::getMallList"); + try { + if(wxMall == null){ + wxMall = new WxMall(); + } + wxMall.setTenantInfo(getTenantInfo()); + PageInfo page = wxMallService.listAadminAsPage(wxMall, pageNum, pageSize); + return new ResultData(page); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return new ResultData(ErrorCode.SYS_SERVER_ERROR); + } + } + @ApiOperation("根据id更新接口") @PostMapping("update") @SystemControllerLog(description = "商城-更新") diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java index 97bd6a50f..ff3cfdf4d 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/tt/TtCouponController.java @@ -354,7 +354,7 @@ public class TtCouponController extends BaseController { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); } - return ttCouponService.auditRejected(record.getId()); + return ttCouponService.auditRejected(record.getId(),record.getRemark()); } }