Skip to content

H
haoban-manage3.0
Commit bedd7a7a by 墨竹
Options

feat：活码修改

parent 1c0c3c24
Showing with 311 additions and 151 deletions
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmQrcodeListDTO.java 0 → 100644
package com.gic.haoban.manage.api.dto.hm;
import java.io.Serializable;
import java.util.Date;
/**
* @author mozhu
* @date 2022/7/6 10:46
*/
public class HmQrcodeListDTO implements Serializable {
private static final long serialVersionUID = -5609169421685423604L;
private Long hmId;
private String hmCode;
/**
* 1单人 2多人
*/
private Integer hmType;
private String wxEnterpriseId;
private String enterpriseId;
private String name;
private String creatorId;
private String creatorName;
private String modifierId;
private String modifierName;
private Date createTime;
private Date updateTime;
/**
* 0删除 1正常 2作废 3待生效
*/
private Integer statusFlag;
/**
* 当日已加好友数
*/
private Integer addNum;
/**
* 是否达上线 1是0否
*/
private Integer overFlag;
/**
* 微信联系我id
*/
private String wxConfigId;
/**
* 微信联系我二维码
*/
private String wxQrcode;
private String wxUserId;
private String storeId;
private String storeName;
private String storeCode;
private String clerkId;
private String clerkName;
private String clerkCode;
/**
* 多人活码人数
*/
private Integer hmUserNum;
/**
* 活码分组
*/
private Long hmGroupId;
public Long getHmId() {
return hmId;
}
public void setHmId(Long hmId) {
this.hmId = hmId;
}
public String getHmCode() {
return hmCode;
}
public void setHmCode(String hmCode) {
this.hmCode = hmCode;
}
public Integer getHmType() {
return hmType;
}
public void setHmType(Integer hmType) {
this.hmType = hmType;
}
public String getWxEnterpriseId() {
return wxEnterpriseId;
}
public void setWxEnterpriseId(String wxEnterpriseId) {
this.wxEnterpriseId = wxEnterpriseId;
}
public String getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(String enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCreatorId() {
return creatorId;
}
public void setCreatorId(String creatorId) {
this.creatorId = creatorId;
}
public String getCreatorName() {
return creatorName;
}
public void setCreatorName(String creatorName) {
this.creatorName = creatorName;
}
public String getModifierId() {
return modifierId;
}
public void setModifierId(String modifierId) {
this.modifierId = modifierId;
}
public String getModifierName() {
return modifierName;
}
public void setModifierName(String modifierName) {
this.modifierName = modifierName;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public Integer getStatusFlag() {
return statusFlag;
}
public void setStatusFlag(Integer statusFlag) {
this.statusFlag = statusFlag;
}
public Integer getAddNum() {
return addNum;
}
public void setAddNum(Integer addNum) {
this.addNum = addNum;
}
public Integer getOverFlag() {
return overFlag;
}
public void setOverFlag(Integer overFlag) {
this.overFlag = overFlag;
}
public String getWxConfigId() {
return wxConfigId;
}
public void setWxConfigId(String wxConfigId) {
this.wxConfigId = wxConfigId;
}
public String getWxQrcode() {
return wxQrcode;
}
public void setWxQrcode(String wxQrcode) {
this.wxQrcode = wxQrcode;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStoreId() {
return storeId;
}
public void setStoreId(String storeId) {
this.storeId = storeId;
}
public String getStoreName() {
return storeName;
}
public void setStoreName(String storeName) {
this.storeName = storeName;
}
public String getStoreCode() {
return storeCode;
}
public void setStoreCode(String storeCode) {
this.storeCode = storeCode;
}
public String getClerkId() {
return clerkId;
}
public void setClerkId(String clerkId) {
this.clerkId = clerkId;
}
public String getClerkName() {
return clerkName;
}
public void setClerkName(String clerkName) {
this.clerkName = clerkName;
}
public String getClerkCode() {
return clerkCode;
}
public void setClerkCode(String clerkCode) {
this.clerkCode = clerkCode;
}
public Integer getHmUserNum() {
return hmUserNum;
}
public void setHmUserNum(Integer hmUserNum) {
this.hmUserNum = hmUserNum;
}
public Long getHmGroupId() {
return hmGroupId;
}
public void setHmGroupId(Long hmGroupId) {
this.hmGroupId = hmGroupId;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/hm/HmQrcodeListQDTO.java
......@@ -12,6 +12,7 @@ import java.util.Date;
* @since 2022-07-04 15:42:20
*/
public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
private static final long serialVersionUID = 887910678030827375L;
private Long hmId;
......@@ -27,50 +28,17 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
private String enterpriseId;
private String name;
private String creatorId;
private String creatorName;
private String modifierId;
private String modifierName;
private Date createTime;
private Date createTimeStart;
private Date updateTime;
/**
* 会员活动标签
*/
private String memberLabelId;
/**
* 1自动通过 0否
*/
private Integer passFlag;
private String welcomeId;
private Date createTimeEnd;
/**
* 0删除 1正常 2作废 3待生效
*/
private Integer statusFlag;
/**
* 当日已加好友数
*/
private Integer addNum;
/**
* 是否达上线 1是0否
*/
private Integer overFlag;
/**
* 微信联系我id
*/
private String wxConfigId;
/**
* 微信联系我二维码
*/
private String wxQrcode;
private String wxUserId;
private String storeId;
......@@ -83,16 +51,12 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
private String clerkName;
private String clerkCode;
/**
* 多人活码人数
*/
private Integer hmUserNum;
/**
* 活码分组
*/
private Long hmGroupId;
public Long getHmId() {
return hmId;
}
......@@ -141,14 +105,6 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
this.name = name;
}
public String getCreatorId() {
return creatorId;
}
public void setCreatorId(String creatorId) {
this.creatorId = creatorId;
}
public String getCreatorName() {
return creatorName;
}
......@@ -157,60 +113,20 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
this.creatorName = creatorName;
}
public String getModifierId() {
return modifierId;
}
public void setModifierId(String modifierId) {
this.modifierId = modifierId;
}
public String getModifierName() {
return modifierName;
}
public void setModifierName(String modifierName) {
this.modifierName = modifierName;
}
public Date getCreateTime() {
return createTime;
public Date getCreateTimeStart() {
return createTimeStart;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
public void setCreateTimeStart(Date createTimeStart) {
this.createTimeStart = createTimeStart;
}
public Date getUpdateTime() {
return updateTime;
public Date getCreateTimeEnd() {
return createTimeEnd;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getMemberLabelId() {
return memberLabelId;
}
public void setMemberLabelId(String memberLabelId) {
this.memberLabelId = memberLabelId;
}
public Integer getPassFlag() {
return passFlag;
}
public void setPassFlag(Integer passFlag) {
this.passFlag = passFlag;
}
public String getWelcomeId() {
return welcomeId;
}
public void setWelcomeId(String welcomeId) {
this.welcomeId = welcomeId;
public void setCreateTimeEnd(Date createTimeEnd) {
this.createTimeEnd = createTimeEnd;
}
public Integer getStatusFlag() {
......@@ -221,46 +137,6 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
this.statusFlag = statusFlag;
}
public Integer getAddNum() {
return addNum;
}
public void setAddNum(Integer addNum) {
this.addNum = addNum;
}
public Integer getOverFlag() {
return overFlag;
}
public void setOverFlag(Integer overFlag) {
this.overFlag = overFlag;
}
public String getWxConfigId() {
return wxConfigId;
}
public void setWxConfigId(String wxConfigId) {
this.wxConfigId = wxConfigId;
}
public String getWxQrcode() {
return wxQrcode;
}
public void setWxQrcode(String wxQrcode) {
this.wxQrcode = wxQrcode;
}
public String getWxUserId() {
return wxUserId;
}
public void setWxUserId(String wxUserId) {
this.wxUserId = wxUserId;
}
public String getStoreId() {
return storeId;
}
......@@ -309,14 +185,6 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
this.clerkCode = clerkCode;
}
public Integer getHmUserNum() {
return hmUserNum;
}
public void setHmUserNum(Integer hmUserNum) {
this.hmUserNum = hmUserNum;
}
public Long getHmGroupId() {
return hmGroupId;
}
......@@ -324,6 +192,5 @@ public class HmQrcodeListQDTO extends BasePageInfo implements Serializable {
public void setHmGroupId(Long hmGroupId) {
this.hmGroupId = hmGroupId;
}
}
haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/hm/HmQrcodeApiService.java
......@@ -2,6 +2,7 @@ package com.gic.haoban.manage.api.service.hm;
import com.gic.haoban.base.api.common.PageResult2;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeListDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
......@@ -39,7 +40,7 @@ public interface HmQrcodeApiService {
* @author mozhu
* @date 2022-07-05 10:59:01
*/
PageResult2<HmQrcodeDTO> queryListByPage(HmQrcodeListQDTO hmQrcodeListQDTO);
PageResult2<HmQrcodeListDTO> queryListByPage(HmQrcodeListQDTO hmQrcodeListQDTO);
/**
* 查询详情
......
haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java
......@@ -9,6 +9,7 @@ import com.gic.haoban.common.utils.PageUtil;
import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeListDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmClerkRelationQDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
......@@ -154,7 +155,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
}
@Override
public PageResult2<HmQrcodeDTO> queryListByPage(HmQrcodeListQDTO hmQrcodeListQDTO) {
public PageResult2<HmQrcodeListDTO> queryListByPage(HmQrcodeListQDTO hmQrcodeListQDTO) {
return PageUtil.getPageInfo(hmQrcodeService.queryByPage(hmQrcodeListQDTO));
}
......
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/hm/HmQrcodeController.java
......@@ -2,9 +2,11 @@ package com.gic.haoban.manage.web.controller.hm;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.haoban.base.api.common.PageResult2;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.AuthWebRequestUtil;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeDTO;
import com.gic.haoban.manage.api.dto.hm.HmQrcodeListDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeListQDTO;
import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
......@@ -21,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
* @since 2022-07-04 15:42:20
*/
@RestController
@RequestMapping("tabHaobanHmQrcode")
@RequestMapping("/hm/qrcode")
public class HmQrcodeController {
@Autowired
private HmQrcodeApiService hmQrcodeApiService;
......@@ -68,7 +70,7 @@ public class HmQrcodeController {
* @return
*/
@RequestMapping(value = "list", method = RequestMethod.POST)
public RestResponse update(@RequestBody HmQrcodeListQDTO hmQrcodeListQDTO) {
public RestResponse<PageResult2<HmQrcodeListDTO>> update(@RequestBody HmQrcodeListQDTO hmQrcodeListQDTO) {
return RestResponse.successResult(this.hmQrcodeApiService.queryListByPage(hmQrcodeListQDTO));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment