| @@ -284,7 +284,7 @@ public class WxCUserDataController extends BaseController { | |||||
| List<CUserDateAmountVo> datas = wxCouponOrderService.queryPriceTotalGroup(tenantId, sTime, eTime); | List<CUserDateAmountVo> datas = wxCouponOrderService.queryPriceTotalGroup(tenantId, sTime, eTime); | ||||
| Map<String, Integer> dataMap = new HashMap<>(); | Map<String, Integer> dataMap = new HashMap<>(); | ||||
| for (CUserDateAmountVo v : datas) { | for (CUserDateAmountVo v : datas) { | ||||
| dataMap.put(v.getxTime(), v.getPrice()); | |||||
| dataMap.put(v.getXTime(), v.getPrice()); | |||||
| } | } | ||||
| Integer todayCount = 0;//今日金额数 | Integer todayCount = 0;//今日金额数 | ||||
| Integer yesterdayCount = 0;//昨日金额数 | Integer yesterdayCount = 0;//昨日金额数 | ||||
| @@ -294,26 +294,11 @@ public class MallUserInfoController extends BaseController { | |||||
| @ApiOperation(value = "用户权限检查") | @ApiOperation(value = "用户权限检查") | ||||
| @GetMapping("getUser") | @GetMapping("getUser") | ||||
| //@RequiresPermissions("sys:user:info") | //@RequiresPermissions("sys:user:info") | ||||
| @SystemControllerLog(description = "用户管理-用户信息") | |||||
| //@SystemControllerLog(description = "用户管理-用户信息") | |||||
| public ResultData getUserInfo() { | public ResultData getUserInfo() { | ||||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); | |||||
| ///logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); | |||||
| MallUserInfo info = getUser(); | MallUserInfo info = getUser(); | ||||
| info.protectInfos(); | info.protectInfos(); | ||||
| // TODO 请用 /menu/nav 获取菜单及权限 | |||||
| List<Long> menuList = mallPermissionService.queryAdminMenuList(info); | |||||
| //list.stream().distinct().collect(Collectors.joining(",")); | |||||
| StringBuilder sb = new StringBuilder(); | |||||
| boolean bFirst = true; | |||||
| for(Long id: menuList) { | |||||
| if(bFirst) { | |||||
| sb.append(id); | |||||
| bFirst = false; | |||||
| } else { | |||||
| sb.append(',').append(id); | |||||
| } | |||||
| } | |||||
| info.setMenus(sb.toString()); | |||||
| return new ResultData(info); | return new ResultData(info); | ||||
| } | } | ||||
| @@ -121,8 +121,8 @@ public class WxCUserController extends BaseController { | |||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); | wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); | ||||
| //新增来自B端的会员关联数据 | //新增来自B端的会员关联数据 | ||||
| wxCUserFromB = new WxCUserFromB(); | wxCUserFromB = new WxCUserFromB(); | ||||
| wxCUserFromB.setbUserId(wxCUserFromBDto.getBUserId()); | |||||
| wxCUserFromB.setcUserId(wxCUserBasicInfo.getId()); | |||||
| wxCUserFromB.setBUserId(wxCUserFromBDto.getBUserId()); | |||||
| wxCUserFromB.setCUserId(wxCUserBasicInfo.getId()); | |||||
| wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); | wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); | ||||
| wxCUserFromB.setMerchantId(bUser.getMerchantId()); | wxCUserFromB.setMerchantId(bUser.getMerchantId()); | ||||
| wxCUserFromB.setTenantId(bUser.getTenantId()); | wxCUserFromB.setTenantId(bUser.getTenantId()); | ||||
| @@ -151,8 +151,8 @@ public class WxCUserController extends BaseController { | |||||
| wxCUserBasicInfoService.save(wxCUserBasicInfo); | wxCUserBasicInfoService.save(wxCUserBasicInfo); | ||||
| //新增来自B端的会员关联数据 | //新增来自B端的会员关联数据 | ||||
| wxCUserFromB = new WxCUserFromB(); | wxCUserFromB = new WxCUserFromB(); | ||||
| wxCUserFromB.setbUserId(wxCUserFromBDto.getBUserId()); | |||||
| wxCUserFromB.setcUserId(cUserId); | |||||
| wxCUserFromB.setBUserId(wxCUserFromBDto.getBUserId()); | |||||
| wxCUserFromB.setCUserId(cUserId); | |||||
| wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); | wxCUserFromB.setOpenid(wxCUserFromBDto.getOpenid()); | ||||
| wxCUserFromB.setMerchantId(bUser.getMerchantId()); | wxCUserFromB.setMerchantId(bUser.getMerchantId()); | ||||
| wxCUserFromB.setTenantId(bUser.getTenantId()); | wxCUserFromB.setTenantId(bUser.getTenantId()); | ||||
| @@ -161,7 +161,7 @@ public class WxCUserController extends BaseController { | |||||
| wxCUserFromBService.saveOrUpdate(wxCUserFromB); | wxCUserFromBService.saveOrUpdate(wxCUserFromB); | ||||
| } | } | ||||
| } else { | } else { | ||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getcUserId()); | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId()); | |||||
| if (!StringUtils.isEmpty(wxCUserFromBDto.getName())) { | if (!StringUtils.isEmpty(wxCUserFromBDto.getName())) { | ||||
| wxCUserBasicInfo.setName(wxCUserFromBDto.getName()); | wxCUserBasicInfo.setName(wxCUserFromBDto.getName()); | ||||
| } | } | ||||
| @@ -222,7 +222,7 @@ public class WxCUserController extends BaseController { | |||||
| } | } | ||||
| WxCUserFromB wxCUserFromB = wxCUserFromBService.getByOpenidAndAppId(wxCUserFromBDto); | WxCUserFromB wxCUserFromB = wxCUserFromBService.getByOpenidAndAppId(wxCUserFromBDto); | ||||
| if(wxCUserFromB!=null){ | if(wxCUserFromB!=null){ | ||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getcUserId()); | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(wxCUserFromB.getCUserId()); | |||||
| return new ResultData(wxCUserBasicInfo); | return new ResultData(wxCUserBasicInfo); | ||||
| } | } | ||||
| return new ResultData(Result.SUCCESS,"查询成功",null); | return new ResultData(Result.SUCCESS,"查询成功",null); | ||||
| @@ -141,7 +141,7 @@ public class WxMicroPayController extends BaseController { | |||||
| WxPayOrder record = new WxPayOrder(); | WxPayOrder record = new WxPayOrder(); | ||||
| record.setTenantId(user.getTenantId()); | record.setTenantId(user.getTenantId()); | ||||
| record.setId(payOrderId); | record.setId(payOrderId); | ||||
| record.setbUserId(user.getId()); | |||||
| record.setBUserId(user.getId()); | |||||
| record.setOrderId(orderId); | record.setOrderId(orderId); | ||||
| try { | try { | ||||
| @@ -171,7 +171,6 @@ public class WxMicroPayController extends BaseController { | |||||
| logger.error("orderId不能为空"); | logger.error("orderId不能为空"); | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | ||||
| } | } | ||||
| WxMerchantBUser user = getUser(); | |||||
| Long payOrderId = 0L; | Long payOrderId = 0L; | ||||
| Long orderId = 0L; | Long orderId = 0L; | ||||
| @@ -191,10 +190,10 @@ public class WxMicroPayController extends BaseController { | |||||
| } | } | ||||
| WxPayOrder record = new WxPayOrder(); | WxPayOrder record = new WxPayOrder(); | ||||
| record.setTenantId(user.getTenantId()); | |||||
| record.setTenantId(getTenantId()); | |||||
| record.setId(payOrderId); | record.setId(payOrderId); | ||||
| record.setPayOrderNo(payOrderIdStr); | record.setPayOrderNo(payOrderIdStr); | ||||
| record.setbUserId(user.getId()); | |||||
| record.setBUserId(getUserId()); | |||||
| record.setOrderId(orderId); | record.setOrderId(orderId); | ||||
| try { | try { | ||||
| @@ -172,7 +172,7 @@ public class WxOrderController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { | ||||
| // c端用户应该只能看到自己的订单 | // c端用户应该只能看到自己的订单 | ||||
| if (wxOrder == null) wxOrder = new WxOrder(); | if (wxOrder == null) wxOrder = new WxOrder(); | ||||
| wxOrder.setcUserId(getUserId()); | |||||
| wxOrder.setCUserId(getUserId()); | |||||
| wxOrder.setSortColumns(WxOrder.Field.UpdateDate_DESC); | wxOrder.setSortColumns(WxOrder.Field.UpdateDate_DESC); | ||||
| final PageInfo<WxOrderCouponVo> page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); | final PageInfo<WxOrderCouponVo> page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); | ||||
| @@ -209,7 +209,7 @@ public class WxOrderController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); | ||||
| } | } | ||||
| wxOrder.setId(id); | wxOrder.setId(id); | ||||
| wxOrder.setcUserId(getUserId()); | |||||
| wxOrder.setCUserId(getUserId()); | |||||
| WxOrderCouponVo wxOrderCVo = wxOrderService.detailCUserVo(wxOrder); | WxOrderCouponVo wxOrderCVo = wxOrderService.detailCUserVo(wxOrder); | ||||
| if (wxOrderCVo == null) | if (wxOrderCVo == null) | ||||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | ||||
| @@ -265,7 +265,7 @@ public class WxOrderController extends BaseController { | |||||
| public ResultData pressOrderList(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { | public ResultData pressOrderList(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { | ||||
| // c端用户应该只能看到自己的订单 | // c端用户应该只能看到自己的订单 | ||||
| if (wxOrder == null) wxOrder = new WxOrder(); | if (wxOrder == null) wxOrder = new WxOrder(); | ||||
| wxOrder.setcUserId(getUserId()); | |||||
| wxOrder.setCUserId(getUserId()); | |||||
| wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC); | wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC); | ||||
| final PageInfo<WxOrderCouponPressVo> page = wxOrderService.listPressVoAsPage(wxOrder, pageNum, pageSize); | final PageInfo<WxOrderCouponPressVo> page = wxOrderService.listPressVoAsPage(wxOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -128,7 +128,7 @@ public class WxPressOrderController extends BaseController { | |||||
| logger.error("订单不存在:" + orderId); | logger.error("订单不存在:" + orderId); | ||||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | ||||
| } | } | ||||
| if(order.getcUserId().equals(getUserId())) { | |||||
| if(order.getCUserId().equals(getUserId())) { | |||||
| ret.put("status", EnumOrderPressStatus.FIRST.getCode()); | ret.put("status", EnumOrderPressStatus.FIRST.getCode()); | ||||
| return new ResultData(ret); | return new ResultData(ret); | ||||
| } | } | ||||
| @@ -136,7 +136,7 @@ public class CouponOrderExpiringSchedule { | |||||
| wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); | wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); | ||||
| if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { | if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { | ||||
| WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); | WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); | ||||
| wxSharingOrderDto.setCUserId(wxPayOrder.getcUserId()); | |||||
| wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId()); | |||||
| wxSharingOrderDto.setMerchantId(0L); | wxSharingOrderDto.setMerchantId(0L); | ||||
| wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); | wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE_FINISH.getCode()); | ||||
| wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); | wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); | ||||
| @@ -2,6 +2,7 @@ package com.iformall.domain.po; | |||||
| import com.iformall.common.SortColumn; | import com.iformall.common.SortColumn; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.extern.slf4j.Slf4j; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| import org.slf4j.LoggerFactory; | import org.slf4j.LoggerFactory; | ||||
| @@ -14,8 +15,9 @@ import java.lang.reflect.Field; | |||||
| * @date 2019/4/24 14:32 | * @date 2019/4/24 14:32 | ||||
| */ | */ | ||||
| @Data | @Data | ||||
| @Slf4j | |||||
| public class BaseEntity implements Serializable { | public class BaseEntity implements Serializable { | ||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | |||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @Transient | @Transient | ||||
| private String sortColumn; | private String sortColumn; | ||||
| @@ -59,7 +61,7 @@ public class BaseEntity implements Serializable { | |||||
| return underscoreName(sortColumn) +" "+sortOrder; | return underscoreName(sortColumn) +" "+sortOrder; | ||||
| } | } | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("BaseEntity.getSortColumn解析失败",e); | |||||
| log.error("BaseEntity.getSortColumn解析失败",e); | |||||
| e.printStackTrace(); | e.printStackTrace(); | ||||
| } | } | ||||
| return sortColumns; | return sortColumns; | ||||
| @@ -7,6 +7,8 @@ import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import lombok.ToString; | import lombok.ToString; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import org.slf4j.Logger; | |||||
| import org.slf4j.LoggerFactory; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| @@ -96,7 +98,6 @@ public class MallUserInfo extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private String captcha; | private String captcha; | ||||
| /**1合同审批 2账单审批**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="1合同审批 2账单审批",name="flowPermission") | @io.swagger.annotations.ApiModelProperty(value="1合同审批 2账单审批",name="flowPermission") | ||||
| private String flowPermission; | private String flowPermission; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_b_log") | @Table(name = "wx_b_log") | ||||
| @Data | |||||
| public class WxBLog implements Serializable { | public class WxBLog implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,64 +21,21 @@ public class WxBLog implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="data") | @io.swagger.annotations.ApiModelProperty(value="",name="data") | ||||
| private String data; | private String data; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getData() { | |||||
| return data; | |||||
| } | |||||
| public void setData(String _data) { | |||||
| data = _data; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||||
| ,Data_ASC("`data` ASC"),Data_DESC("`data` DESC") | ,Data_ASC("`data` ASC"),Data_DESC("`data` DESC") | ||||
| ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") | |||||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| Field(String value){ | Field(String value){ | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -11,6 +13,7 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_bill_action") | @Table(name = "wx_bill_action") | ||||
| @Data | |||||
| public class WxBillAction implements Serializable { | public class WxBillAction implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -22,26 +25,6 @@ public class WxBillAction implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -76,94 +59,6 @@ public class WxBillAction implements Serializable { | |||||
| @Transient | @Transient | ||||
| private Long newPrice; | private Long newPrice; | ||||
| public Long getOldPrice() { | |||||
| return oldPrice; | |||||
| } | |||||
| public void setOldPrice(Long oldPrice) { | |||||
| this.oldPrice = oldPrice; | |||||
| } | |||||
| public Long getNewPrice() { | |||||
| return newPrice; | |||||
| } | |||||
| public void setNewPrice(Long newPrice) { | |||||
| this.newPrice = newPrice; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public Long getBillId() { | |||||
| return billId; | |||||
| } | |||||
| public void setBillId(Long billId) { | |||||
| this.billId = billId; | |||||
| } | |||||
| public Long getUserId() { | |||||
| return userId; | |||||
| } | |||||
| public void setUserId(Long userId) { | |||||
| this.userId = userId; | |||||
| } | |||||
| public String getUserName() { | |||||
| return userName; | |||||
| } | |||||
| public void setUserName(String userName) { | |||||
| this.userName = userName; | |||||
| } | |||||
| public String getPhone() { | |||||
| return phone; | |||||
| } | |||||
| public void setPhone(String phone) { | |||||
| this.phone = phone; | |||||
| } | |||||
| public Integer getAction() { | |||||
| return action; | |||||
| } | |||||
| public void setAction(Integer action) { | |||||
| this.action = action; | |||||
| } | |||||
| public String getDetails() { | |||||
| return details; | |||||
| } | |||||
| public void setDetails(String details) { | |||||
| this.details = details; | |||||
| } | |||||
| 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 static enum Field { | public static enum Field { | ||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"); | Id_ASC("`id` ASC"), Id_DESC("`id` DESC"); | ||||
| private String value; | private String value; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -12,6 +14,7 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_bill_rent_deposit") | @Table(name = "wx_bill_rent_deposit") | ||||
| @Data | |||||
| public class WxBillDeposit implements Serializable { | public class WxBillDeposit implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -22,73 +25,41 @@ public class WxBillDeposit implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @Transient | @Transient | ||||
| private String merchantName; | private String merchantName; | ||||
| /*租金合同ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") | @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") | ||||
| private Long rentContractId; | private Long rentContractId; | ||||
| /*实际应收金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | ||||
| private Long receivePay; | private Long receivePay; | ||||
| /*实收金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | ||||
| private Long pay; | private Long pay; | ||||
| /*收款日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| /*到账日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | ||||
| private Date payDate; | private Date payDate; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| /*逾期天数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | ||||
| private Long expiredDay; | private Long expiredDay; | ||||
| /*租户**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*欠缴**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | ||||
| private Long owe; | private Long owe; | ||||
| /*账单状态1未到期2待缴3欠缴4已结清**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| /*是否删除 是1否0 未到期不显示**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") | @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") | ||||
| private Integer isDel; | private Integer isDel; | ||||
| /*应收金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | ||||
| private Long needPay; | private Long needPay; | ||||
| /*商户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*账号ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId") | @io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId") | ||||
| private Long userId; | private Long userId; | ||||
| /*商铺ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | ||||
| private Long shopId; | private Long shopId; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | ||||
| private Date updatetime; | private Date updatetime; | ||||
| @@ -110,168 +81,6 @@ public class WxBillDeposit implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") | @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") | ||||
| private Integer payWay; | private Integer payWay; | ||||
| public Integer getPayWay() { | |||||
| return payWay; | |||||
| } | |||||
| public void setPayWay(Integer payWay) { | |||||
| this.payWay = payWay; | |||||
| } | |||||
| public String getShopInfo() { | |||||
| return shopInfo; | |||||
| } | |||||
| public void setShopInfo(String shopInfo) { | |||||
| this.shopInfo = shopInfo; | |||||
| } | |||||
| public Date getStarttime() { | |||||
| return starttime; | |||||
| } | |||||
| public void setStarttime(Date starttime) { | |||||
| this.starttime = starttime; | |||||
| } | |||||
| public Date getEndtime() { | |||||
| return endtime; | |||||
| } | |||||
| public void setEndtime(Date endtime) { | |||||
| this.endtime = endtime; | |||||
| } | |||||
| public Long getRentContractId() { | |||||
| return rentContractId; | |||||
| } | |||||
| public void setRentContractId(Long _rentContractId) { | |||||
| rentContractId = _rentContractId; | |||||
| } | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | |||||
| } | |||||
| public void setReceivePay(Long _receivePay) { | |||||
| receivePay = _receivePay; | |||||
| } | |||||
| public Long getPay() { | |||||
| return pay; | |||||
| } | |||||
| public void setPay(Long _pay) { | |||||
| pay = _pay; | |||||
| } | |||||
| public Date getReceiveDate() { | |||||
| return receiveDate; | |||||
| } | |||||
| public void setReceiveDate(Date _receiveDate) { | |||||
| receiveDate = _receiveDate; | |||||
| } | |||||
| public Date getPayDate() { | |||||
| return payDate; | |||||
| } | |||||
| public void setPayDate(Date _payDate) { | |||||
| payDate = _payDate; | |||||
| } | |||||
| public Date getCreatetime() { | |||||
| return createtime; | |||||
| } | |||||
| public void setCreatetime(Date _createtime) { | |||||
| createtime = _createtime; | |||||
| } | |||||
| public Long getExpiredDay() { | |||||
| return expiredDay; | |||||
| } | |||||
| public void setExpiredDay(Long _expiredDay) { | |||||
| expiredDay = _expiredDay; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getOwe() { | |||||
| return owe; | |||||
| } | |||||
| public void setOwe(Long _owe) { | |||||
| owe = _owe; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer _status) { | |||||
| status = _status; | |||||
| } | |||||
| public Integer getIsDel() { | |||||
| return isDel; | |||||
| } | |||||
| public void setIsDel(Integer _isDel) { | |||||
| isDel = _isDel; | |||||
| } | |||||
| public Long getNeedPay() { | |||||
| return needPay; | |||||
| } | |||||
| public void setNeedPay(Long _needPay) { | |||||
| needPay = _needPay; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Long getUserId() { | |||||
| return userId; | |||||
| } | |||||
| public void setUserId(Long _userId) { | |||||
| userId = _userId; | |||||
| } | |||||
| public Long getShopId() { | |||||
| return shopId; | |||||
| } | |||||
| public void setShopId(Long _shopId) { | |||||
| shopId = _shopId; | |||||
| } | |||||
| public Date getUpdatetime() { | |||||
| return updatetime; | |||||
| } | |||||
| public void setUpdatetime(Date _updatetime) { | |||||
| updatetime = _updatetime; | |||||
| } | |||||
| public String getMerchantName() { | |||||
| return merchantName; | |||||
| } | |||||
| public void setMerchantName(String merchantName) { | |||||
| this.merchantName = merchantName; | |||||
| } | |||||
| public Integer getRentShopType() { | |||||
| return rentShopType; | |||||
| } | |||||
| public void setRentShopType(Integer rentShopType) { | |||||
| this.rentShopType = rentShopType; | |||||
| } | |||||
| public Integer getReturnPrice() { | |||||
| return returnPrice; | |||||
| } | |||||
| public void setReturnPrice(Integer returnPrice) { | |||||
| this.returnPrice = returnPrice; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -12,6 +14,7 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_bill_property_deposit") | @Table(name = "wx_bill_property_deposit") | ||||
| @Data | |||||
| public class WxBillPropertyDeposit implements Serializable { | public class WxBillPropertyDeposit implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -22,73 +25,40 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @Transient | @Transient | ||||
| private String merchantName; | private String merchantName; | ||||
| /*租金合同ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId") | @io.swagger.annotations.ApiModelProperty(value="物业合同ID",name="propertyContractId") | ||||
| private Long propertyContractId; | private Long propertyContractId; | ||||
| /*实际应收金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | @io.swagger.annotations.ApiModelProperty(value="实际应收金额",name="receivePay") | ||||
| private Long receivePay; | private Long receivePay; | ||||
| /*实收金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | ||||
| private Long pay; | private Long pay; | ||||
| /*收款日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| /*到账日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | ||||
| private Date payDate; | private Date payDate; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| /*逾期天数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | ||||
| private Long expiredDay; | private Long expiredDay; | ||||
| /*租户**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*欠缴**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | @io.swagger.annotations.ApiModelProperty(value="欠缴",name="owe") | ||||
| private Long owe; | private Long owe; | ||||
| /*账单状态1未到期2待缴3欠缴4已结清**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期5已退还", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| /*是否删除 是1否0 未到期不显示**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") | @io.swagger.annotations.ApiModelProperty(value="是否删除 是1否0 未到期不显示",name="isDel") | ||||
| private Integer isDel; | private Integer isDel; | ||||
| /*应收金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | @io.swagger.annotations.ApiModelProperty(value="应收金额",name="needPay") | ||||
| private Long needPay; | private Long needPay; | ||||
| /*商户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*账号ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId") | @io.swagger.annotations.ApiModelProperty(value="账号ID",name="userId") | ||||
| private Long userId; | private Long userId; | ||||
| /*商铺ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | ||||
| private Long shopId; | private Long shopId; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | ||||
| private Date updatetime; | private Date updatetime; | ||||
| @@ -110,168 +80,6 @@ public class WxBillPropertyDeposit implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") | @io.swagger.annotations.ApiModelProperty(value = "支付方式:见枚举EnumBillPayWay", name = "payWay") | ||||
| private Integer payWay; | private Integer payWay; | ||||
| public Integer getPayWay() { | |||||
| return payWay; | |||||
| } | |||||
| public void setPayWay(Integer payWay) { | |||||
| this.payWay = payWay; | |||||
| } | |||||
| public String getShopInfo() { | |||||
| return shopInfo; | |||||
| } | |||||
| public void setShopInfo(String shopInfo) { | |||||
| this.shopInfo = shopInfo; | |||||
| } | |||||
| public Date getStarttime() { | |||||
| return starttime; | |||||
| } | |||||
| public void setStarttime(Date starttime) { | |||||
| this.starttime = starttime; | |||||
| } | |||||
| public Date getEndtime() { | |||||
| return endtime; | |||||
| } | |||||
| public void setEndtime(Date endtime) { | |||||
| this.endtime = endtime; | |||||
| } | |||||
| public Long getPropertyContractId() { | |||||
| return propertyContractId; | |||||
| } | |||||
| public void setPropertyContractId(Long propertyContractId) { | |||||
| this.propertyContractId = propertyContractId; | |||||
| } | |||||
| public Long getReceivePay() { | |||||
| return receivePay; | |||||
| } | |||||
| public void setReceivePay(Long _receivePay) { | |||||
| receivePay = _receivePay; | |||||
| } | |||||
| public Long getPay() { | |||||
| return pay; | |||||
| } | |||||
| public void setPay(Long _pay) { | |||||
| pay = _pay; | |||||
| } | |||||
| public Date getReceiveDate() { | |||||
| return receiveDate; | |||||
| } | |||||
| public void setReceiveDate(Date _receiveDate) { | |||||
| receiveDate = _receiveDate; | |||||
| } | |||||
| public Date getPayDate() { | |||||
| return payDate; | |||||
| } | |||||
| public void setPayDate(Date _payDate) { | |||||
| payDate = _payDate; | |||||
| } | |||||
| public Date getCreatetime() { | |||||
| return createtime; | |||||
| } | |||||
| public void setCreatetime(Date _createtime) { | |||||
| createtime = _createtime; | |||||
| } | |||||
| public Long getExpiredDay() { | |||||
| return expiredDay; | |||||
| } | |||||
| public void setExpiredDay(Long _expiredDay) { | |||||
| expiredDay = _expiredDay; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getOwe() { | |||||
| return owe; | |||||
| } | |||||
| public void setOwe(Long _owe) { | |||||
| owe = _owe; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer _status) { | |||||
| status = _status; | |||||
| } | |||||
| public Integer getIsDel() { | |||||
| return isDel; | |||||
| } | |||||
| public void setIsDel(Integer _isDel) { | |||||
| isDel = _isDel; | |||||
| } | |||||
| public Long getNeedPay() { | |||||
| return needPay; | |||||
| } | |||||
| public void setNeedPay(Long _needPay) { | |||||
| needPay = _needPay; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Long getUserId() { | |||||
| return userId; | |||||
| } | |||||
| public void setUserId(Long _userId) { | |||||
| userId = _userId; | |||||
| } | |||||
| public Long getShopId() { | |||||
| return shopId; | |||||
| } | |||||
| public void setShopId(Long _shopId) { | |||||
| shopId = _shopId; | |||||
| } | |||||
| public Date getUpdatetime() { | |||||
| return updatetime; | |||||
| } | |||||
| public void setUpdatetime(Date _updatetime) { | |||||
| updatetime = _updatetime; | |||||
| } | |||||
| public String getMerchantName() { | |||||
| return merchantName; | |||||
| } | |||||
| public void setMerchantName(String merchantName) { | |||||
| this.merchantName = merchantName; | |||||
| } | |||||
| public Integer getRentShopType() { | |||||
| return rentShopType; | |||||
| } | |||||
| public void setRentShopType(Integer rentShopType) { | |||||
| this.rentShopType = rentShopType; | |||||
| } | |||||
| public Long getReturnPrice() { | |||||
| return returnPrice; | |||||
| } | |||||
| public void setReturnPrice(Long returnPrice) { | |||||
| this.returnPrice = returnPrice; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_business") | @Table(name = "wx_business") | ||||
| @Data | |||||
| public class WxBusiness implements Serializable { | public class WxBusiness implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,66 +21,15 @@ public class WxBusiness implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Integer getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Integer id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*业态名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="业态名",name="title") | @io.swagger.annotations.ApiModelProperty(value="业态名",name="title") | ||||
| private String title; | private String title; | ||||
| /*1.优惠券**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="1.优惠券",name="type") | @io.swagger.annotations.ApiModelProperty(value="1.优惠券",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| public String getTitle() { | |||||
| return title; | |||||
| } | |||||
| public void setTitle(String _title) { | |||||
| title = _title; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer _type) { | |||||
| type = _type; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_c_log") | @Table(name = "wx_c_log") | ||||
| @Data | |||||
| public class WxCLog implements Serializable { | public class WxCLog implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,64 +21,20 @@ public class WxCLog implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="data") | @io.swagger.annotations.ApiModelProperty(value="",name="data") | ||||
| private String data; | private String data; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getData() { | |||||
| return data; | |||||
| } | |||||
| public void setData(String _data) { | |||||
| data = _data; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||||
| ,Data_ASC("`data` ASC"),Data_DESC("`data` DESC") | ,Data_ASC("`data` ASC"),Data_DESC("`data` DESC") | ||||
| ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") | |||||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| Field(String value){ | Field(String value){ | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_c_user_car") | @Table(name = "wx_c_user_car") | ||||
| @Data | |||||
| public class WxCUserCar implements Serializable { | public class WxCUserCar implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,94 +21,21 @@ public class WxCUserCar implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*c端用户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") | ||||
| private Long cUserId; | private Long cUserId; | ||||
| /*车牌号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") | @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") | ||||
| private String carNumber; | private String carNumber; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /*停车厂家(2:TJD)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车厂家(2:TJD)",name="vendorType") | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车厂家(1:ETCP,2:TJD)",name="vendorType") | |||||
| private Integer vendorType; | private Integer vendorType; | ||||
| /*停车厂家参数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车厂家参数",name="vendorParams") | @io.swagger.annotations.ApiModelProperty(value="停车厂家参数",name="vendorParams") | ||||
| private String vendorParams; | private String vendorParams; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getCUserId() { | |||||
| return cUserId; | |||||
| } | |||||
| public void setCUserId(Long _cUserId) { | |||||
| cUserId = _cUserId; | |||||
| } | |||||
| public String getCarNumber() { | |||||
| return carNumber; | |||||
| } | |||||
| public void setCarNumber(String _carNumber) { | |||||
| carNumber = _carNumber; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public Integer getVendorType() { | |||||
| return vendorType; | |||||
| } | |||||
| public void setVendorType(Integer _vendorType) { | |||||
| vendorType = _vendorType; | |||||
| } | |||||
| public String getVendorParams() { | |||||
| return vendorParams; | |||||
| } | |||||
| public void setVendorParams(String _vendorParams) { | |||||
| vendorParams = _vendorParams; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_c_user_from_b") | @Table(name = "wx_c_user_from_b") | ||||
| @Data | |||||
| public class WxCUserFromB implements Serializable { | public class WxCUserFromB implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,117 +22,26 @@ public class WxCUserFromB implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*商户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*b_user_id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="b_user_id",name="bUserId") | @io.swagger.annotations.ApiModelProperty(value="b_user_id",name="bUserId") | ||||
| private Long bUserId; | private Long bUserId; | ||||
| /*c_user_id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="c_user_id",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="c_user_id",name="cUserId") | ||||
| private Long cUserId; | private Long cUserId; | ||||
| /*会员信息**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="会员信息",name="info") | @io.swagger.annotations.ApiModelProperty(value="会员信息",name="info") | ||||
| private String info; | private String info; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| /*openid**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="openid",name="openid") | @io.swagger.annotations.ApiModelProperty(value="openid",name="openid") | ||||
| private String openid; | private String openid; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="appId") | @io.swagger.annotations.ApiModelProperty(value="",name="appId") | ||||
| private String appId; | private String appId; | ||||
| public String getAppId() { | |||||
| return appId; | |||||
| } | |||||
| public void setAppId(String appId) { | |||||
| this.appId = appId; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Long getbUserId() { | |||||
| return bUserId; | |||||
| } | |||||
| public void setbUserId(Long bUserId) { | |||||
| this.bUserId = bUserId; | |||||
| } | |||||
| public Long getcUserId() { | |||||
| return cUserId; | |||||
| } | |||||
| public void setcUserId(Long cUserId) { | |||||
| this.cUserId = cUserId; | |||||
| } | |||||
| public String getInfo() { | |||||
| return info; | |||||
| } | |||||
| public void setInfo(String _info) { | |||||
| info = _info; | |||||
| } | |||||
| public Date getCreateTime() { | |||||
| return createTime; | |||||
| } | |||||
| public void setCreateTime(Date _createTime) { | |||||
| createTime = _createTime; | |||||
| } | |||||
| public Date getUpdateTime() { | |||||
| return updateTime; | |||||
| } | |||||
| public void setUpdateTime(Date _updateTime) { | |||||
| updateTime = _updateTime; | |||||
| } | |||||
| public String getOpenid() { | |||||
| return openid; | |||||
| } | |||||
| public void setOpenid(String _openid) { | |||||
| openid = _openid; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_c_user_tags") | @Table(name = "wx_c_user_tags") | ||||
| @Data | |||||
| public class WxCUserTags implements Serializable { | public class WxCUserTags implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,75 +21,17 @@ public class WxCUserTags implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*c端用户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId") | @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="userId") | ||||
| private Long userId; | private Long userId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="tags") | @io.swagger.annotations.ApiModelProperty(value="",name="tags") | ||||
| private String tags; | private String tags; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getUserId() { | |||||
| return userId; | |||||
| } | |||||
| public void setUserId(Long _userId) { | |||||
| userId = _userId; | |||||
| } | |||||
| public String getTags() { | |||||
| return tags; | |||||
| } | |||||
| public void setTags(String _tags) { | |||||
| tags = _tags; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_car_cmd_log") | @Table(name = "wx_car_cmd_log") | ||||
| @Data | |||||
| public class WxCarCmdLog implements Serializable { | public class WxCarCmdLog implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,95 +21,29 @@ public class WxCarCmdLog implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | private String tenantId; | ||||
| /*停车厂家,1. ETCP,2.停简单**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车厂家,1. ETCP,2.停简单",name="vendorType") | @io.swagger.annotations.ApiModelProperty(value="停车厂家,1. ETCP,2.停简单",name="vendorType") | ||||
| private Integer vendorType; | private Integer vendorType; | ||||
| /*停车厂家命令**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车厂家命令",name="cmdType") | @io.swagger.annotations.ApiModelProperty(value="停车厂家命令",name="cmdType") | ||||
| private Integer cmdType; | private Integer cmdType; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="updateDate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | |||||
| private Date updateDate; | private Date updateDate; | ||||
| /*命令请求或者结果及相应花费的时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="命令请求或者结果及相应花费的时间",name="cmdJson") | @io.swagger.annotations.ApiModelProperty(value="命令请求或者结果及相应花费的时间",name="cmdJson") | ||||
| private String cmdJson; | private String cmdJson; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Integer getVendorType() { | |||||
| return vendorType; | |||||
| } | |||||
| public void setVendorType(Integer _vendorType) { | |||||
| vendorType = _vendorType; | |||||
| } | |||||
| public Integer getCmdType() { | |||||
| return cmdType; | |||||
| } | |||||
| public void setCmdType(Integer _cmdType) { | |||||
| cmdType = _cmdType; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public String getCmdJson() { | |||||
| return cmdJson; | |||||
| } | |||||
| public void setCmdJson(String _cmdJson) { | |||||
| cmdJson = _cmdJson; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||||
| ,VendorType_ASC("`vendorType` ASC"),VendorType_DESC("`vendorType` DESC") | |||||
| ,CmdType_ASC("`cmdType` ASC"),CmdType_DESC("`cmdType` DESC") | |||||
| ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") | |||||
| ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") | |||||
| ,CmdJson_ASC("`cmdJson` ASC"),CmdJson_DESC("`cmdJson` DESC") | |||||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||||
| ,VendorType_ASC("`vendor_type` ASC"),VendorType_DESC("`vendor_type` DESC") | |||||
| ,CmdType_ASC("`cmd_type` ASC"),CmdType_DESC("`cmd_type` DESC") | |||||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | |||||
| ,CmdJson_ASC("`cmd_json` ASC"),CmdJson_DESC("`cmd_json` DESC") | |||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| Field(String value){ | Field(String value){ | ||||
| @@ -25,56 +25,41 @@ public class WxCardSpend implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| /**租户ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**储值卡ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="储值卡ID",name="cardId") | @io.swagger.annotations.ApiModelProperty(value="储值卡ID",name="cardId") | ||||
| private Long cardId; | private Long cardId; | ||||
| /**持有人ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="持有人ID",name="ownerId") | @io.swagger.annotations.ApiModelProperty(value="持有人ID",name="ownerId") | ||||
| private Long ownerId; | private Long ownerId; | ||||
| /**商户ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /**订单账号*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="订单账号",name="orderId") | @io.swagger.annotations.ApiModelProperty(value="订单账号",name="orderId") | ||||
| private Long orderId; | private Long orderId; | ||||
| /**ip地址*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") | @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") | ||||
| private String ip; | private String ip; | ||||
| /**抵扣金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="抵扣金额",name="deductionAmount") | @io.swagger.annotations.ApiModelProperty(value="抵扣金额",name="deductionAmount") | ||||
| private Integer deductionAmount; | private Integer deductionAmount; | ||||
| /**支付金额(包含通道费)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付金额(包含通道费)",name="payment") | @io.swagger.annotations.ApiModelProperty(value="支付金额(包含通道费)",name="payment") | ||||
| private Integer payment; | private Integer payment; | ||||
| /**实收金额(不包含通道费)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额(不包含通道费)",name="realPayment") | @io.swagger.annotations.ApiModelProperty(value="实收金额(不包含通道费)",name="realPayment") | ||||
| private Integer realPayment; | private Integer realPayment; | ||||
| /**卡剩余总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="卡剩余总金额",name="cardRemainAmount") | @io.swagger.annotations.ApiModelProperty(value="卡剩余总金额",name="cardRemainAmount") | ||||
| private Integer cardRemainAmount; | private Integer cardRemainAmount; | ||||
| /**卡支付前总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="卡支付前总金额",name="cardBeforeAmount") | @io.swagger.annotations.ApiModelProperty(value="卡支付前总金额",name="cardBeforeAmount") | ||||
| private Integer cardBeforeAmount; | private Integer cardBeforeAmount; | ||||
| /**卡剩余实际总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="卡剩余总金额",name="cardRemainRealAmount") | @io.swagger.annotations.ApiModelProperty(value="卡剩余总金额",name="cardRemainRealAmount") | ||||
| private Integer cardRemainRealAmount; | private Integer cardRemainRealAmount; | ||||
| /**卡支付前实际总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="卡支付前总金额",name="cardBeforeRealAmount") | @io.swagger.annotations.ApiModelProperty(value="卡支付前总金额",name="cardBeforeRealAmount") | ||||
| private Integer cardBeforeRealAmount; | private Integer cardBeforeRealAmount; | ||||
| /**创建时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | |||||
| @Excel(name="交易时间",width = 20,orderNum = "6",format="yyyy-MM-dd HH:mm") | @Excel(name="交易时间",width = 20,orderNum = "6",format="yyyy-MM-dd HH:mm") | ||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | |||||
| private Date createDate; | private Date createDate; | ||||
| /**更新时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /**支付状态*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付状态(0:未分帐, 1:已分账, 2:已人工分账)",name="payStatus") | |||||
| @Excel(name="补贴状态",width = 20,orderNum = "10",replace = { "未支付_0", "已分账_1","已人工分账_2"}) | @Excel(name="补贴状态",width = 20,orderNum = "10",replace = { "未支付_0", "已分账_1","已人工分账_2"}) | ||||
| @io.swagger.annotations.ApiModelProperty(value="支付状态(0:未分帐, 1:已分账, 2:已人工分账)",name="payStatus") | |||||
| private Integer payStatus; | private Integer payStatus; | ||||
| @Transient | @Transient | ||||
| @@ -120,10 +105,6 @@ public class WxCardSpend implements Serializable { | |||||
| return deductionAmountStr; | return deductionAmountStr; | ||||
| } | } | ||||
| public void setDeductionAmountStr(String deductionAmountStr) { | |||||
| this.deductionAmountStr = deductionAmountStr; | |||||
| } | |||||
| public String getPaymentStr() { | public String getPaymentStr() { | ||||
| if(getPayment()!=null) { | if(getPayment()!=null) { | ||||
| paymentStr = new BigDecimal(getPayment()).divide(new BigDecimal(100)).toString(); | paymentStr = new BigDecimal(getPayment()).divide(new BigDecimal(100)).toString(); | ||||
| @@ -131,10 +112,6 @@ public class WxCardSpend implements Serializable { | |||||
| return paymentStr; | return paymentStr; | ||||
| } | } | ||||
| public void setPaymentStr(String paymentStr) { | |||||
| this.paymentStr = paymentStr; | |||||
| } | |||||
| public String getRealPaymentStr() { | public String getRealPaymentStr() { | ||||
| if(getRealPayment()!=null) { | if(getRealPayment()!=null) { | ||||
| realPaymentStr = new BigDecimal(getRealPayment()).divide(new BigDecimal(100)).toString(); | realPaymentStr = new BigDecimal(getRealPayment()).divide(new BigDecimal(100)).toString(); | ||||
| @@ -142,10 +119,6 @@ public class WxCardSpend implements Serializable { | |||||
| return realPaymentStr; | return realPaymentStr; | ||||
| } | } | ||||
| public void setRealPaymentStr(String realPaymentStr) { | |||||
| this.realPaymentStr = realPaymentStr; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -7,6 +9,7 @@ import java.io.Serializable; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_channel") | @Table(name = "wx_channel") | ||||
| @Data | |||||
| public class WxChannel implements Serializable { | public class WxChannel implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,81 +21,21 @@ public class WxChannel implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /** | |||||
| * 渠道ID | |||||
| **/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "渠道ID", name = "channelId") | @io.swagger.annotations.ApiModelProperty(value = "渠道ID", name = "channelId") | ||||
| private Integer channelId; | private Integer channelId; | ||||
| /** | |||||
| * 渠道名 | |||||
| **/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "渠道名", name = "title") | @io.swagger.annotations.ApiModelProperty(value = "渠道名", name = "title") | ||||
| private String title; | private String title; | ||||
| /** | |||||
| * 图片url | |||||
| **/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "图片url", name = "img") | @io.swagger.annotations.ApiModelProperty(value = "图片url", name = "img") | ||||
| private String img; | private String img; | ||||
| /** | |||||
| * 是否支持批量投放 | |||||
| **/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "是否支持批量投放0:不支持,1:支持", name = "batch") | @io.swagger.annotations.ApiModelProperty(value = "是否支持批量投放0:不支持,1:支持", name = "batch") | ||||
| private Integer batch; | private Integer batch; | ||||
| public Integer getChannelId() { | |||||
| return channelId; | |||||
| } | |||||
| public void setChannelId(Integer _channelId) { | |||||
| channelId = _channelId; | |||||
| } | |||||
| public String getTitle() { | |||||
| return title; | |||||
| } | |||||
| public void setTitle(String _title) { | |||||
| title = _title; | |||||
| } | |||||
| public String getImg() { | |||||
| return img; | |||||
| } | |||||
| public void setImg(String _img) { | |||||
| img = _img; | |||||
| } | |||||
| public Integer getBatch() { | |||||
| return batch; | |||||
| } | |||||
| public void setBatch(Integer batch) { | |||||
| this.batch = batch; | |||||
| } | |||||
| public static enum Field { | public static enum Field { | ||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), ChannelId_ASC("`channel_id` ASC"), ChannelId_DESC("`channel_id` DESC"), Title_ASC("`title` ASC"), Title_DESC("`title` DESC"), Img_ASC("`img` ASC"), Img_DESC("`img` DESC"), Batch_ASC("`batch` ASC"), atch_DESC("`batch` DESC"); | |||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC") | |||||
| , ChannelId_ASC("`channel_id` ASC"), ChannelId_DESC("`channel_id` DESC") | |||||
| , Title_ASC("`title` ASC"), Title_DESC("`title` DESC") | |||||
| , Img_ASC("`img` ASC"), Img_DESC("`img` DESC") | |||||
| , Batch_ASC("`batch` ASC"), atch_DESC("`batch` DESC"); | |||||
| private String value; | private String value; | ||||
| Field(String value) { | Field(String value) { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_coupon_action_log") | @Table(name = "wx_coupon_action_log") | ||||
| @Data | |||||
| public class WxCouponActionLog implements Serializable { | public class WxCouponActionLog implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -20,105 +23,21 @@ public class WxCouponActionLog implements Serializable { | |||||
| protected String sortColumns; | protected String sortColumns; | ||||
| @Transient | @Transient | ||||
| protected Date startTime; | protected Date startTime; | ||||
| @Transient | @Transient | ||||
| protected Date endTime; | protected Date endTime; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| public Date getStartTime() { | |||||
| return startTime; | |||||
| } | |||||
| public void setStartTime(Date startTime) { | |||||
| this.startTime = startTime; | |||||
| } | |||||
| public Date getEndTime() { | |||||
| return endTime; | |||||
| } | |||||
| public void setEndTime(Date endTime) { | |||||
| this.endTime = endTime; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*coupon id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") | |||||
| @io.swagger.annotations.ApiModelProperty(value="券id",name="couponId") | |||||
| private Long couponId; | private Long couponId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="couponOrderId") | |||||
| @io.swagger.annotations.ApiModelProperty(value="券包ID",name="couponOrderId") | |||||
| private Long couponOrderId; | private Long couponOrderId; | ||||
| /*0:精准 1:主动领取 2:用户购买 3:停车 4:核销**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="0:精准 1:主动领取 2:用户购买 3:停车 4:核销",name="channelType") | @io.swagger.annotations.ApiModelProperty(value="0:精准 1:主动领取 2:用户购买 3:停车 4:核销",name="channelType") | ||||
| private Integer channelType; | private Integer channelType; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="channelId") | @io.swagger.annotations.ApiModelProperty(value="",name="channelId") | ||||
| private Long channelId; | private Long channelId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getCouponId() { | |||||
| return couponId; | |||||
| } | |||||
| public void setCouponId(Long _couponId) { | |||||
| couponId = _couponId; | |||||
| } | |||||
| public Long getCouponOrderId() { | |||||
| return couponOrderId; | |||||
| } | |||||
| public void setCouponOrderId(Long _couponOrderId) { | |||||
| couponOrderId = _couponOrderId; | |||||
| } | |||||
| public Integer getChannelType() { | |||||
| return channelType; | |||||
| } | |||||
| public void setChannelType(Integer _channelType) { | |||||
| channelType = _channelType; | |||||
| } | |||||
| public Long getChannelId() { | |||||
| return channelId; | |||||
| } | |||||
| public void setChannelId(Long _channelId) { | |||||
| channelId = _channelId; | |||||
| } | |||||
| public Date getCreateTime() { | |||||
| return createTime; | |||||
| } | |||||
| public void setCreateTime(Date createTime) { | |||||
| this.createTime = createTime; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_coupon_car") | @Table(name = "wx_coupon_car") | ||||
| @Data | |||||
| public class WxCouponCar implements Serializable { | public class WxCouponCar implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,94 +21,29 @@ public class WxCouponCar implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*停车场ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车场ID",name="parkId") | @io.swagger.annotations.ApiModelProperty(value="停车场ID",name="parkId") | ||||
| private Long parkId; | private Long parkId; | ||||
| /*车场服务商类型(1: ETCP,2:停简单)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="车场服务商类型(1: ETCP,2:停简单)",name="vendorType") | @io.swagger.annotations.ApiModelProperty(value="车场服务商类型(1: ETCP,2:停简单)",name="vendorType") | ||||
| private Integer vendorType; | private Integer vendorType; | ||||
| /*车场厂商相关信息**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") | @io.swagger.annotations.ApiModelProperty(value="车场厂商相关信息",name="vendorParams") | ||||
| private String vendorParams; | private String vendorParams; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getParkId() { | |||||
| return parkId; | |||||
| } | |||||
| public void setParkId(Long _parkId) { | |||||
| parkId = _parkId; | |||||
| } | |||||
| public Integer getVendorType() { | |||||
| return vendorType; | |||||
| } | |||||
| public void setVendorType(Integer _vendorType) { | |||||
| vendorType = _vendorType; | |||||
| } | |||||
| public String getVendorParams() { | |||||
| return vendorParams; | |||||
| } | |||||
| public void setVendorParams(String _vendorParams) { | |||||
| vendorParams = _vendorParams; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||||
| ,ParkId_ASC("`parkId` ASC"),ParkId_DESC("`parkId` DESC") | |||||
| ,VendorType_ASC("`vendorType` ASC"),VendorType_DESC("`vendorType` DESC") | |||||
| ,VendorParams_ASC("`vendorParams` ASC"),VendorParams_DESC("`vendorParams` DESC") | |||||
| ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") | |||||
| ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") | |||||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||||
| ,ParkId_ASC("`park_id` ASC"),ParkId_DESC("`park_id` DESC") | |||||
| ,VendorType_ASC("`vendor_type` ASC"),VendorType_DESC("`vendor_type` DESC") | |||||
| ,VendorParams_ASC("`vendor_params` ASC"),VendorParams_DESC("`vendor_params` DESC") | |||||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | |||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| Field(String value){ | Field(String value){ | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_coupon_merchant") | @Table(name = "wx_coupon_merchant") | ||||
| @Data | |||||
| public class WxCouponMerchant implements Serializable { | public class WxCouponMerchant implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,108 +22,23 @@ public class WxCouponMerchant implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="productId") | @io.swagger.annotations.ApiModelProperty(value="",name="productId") | ||||
| private Long productId; | private Long productId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="parameter") | @io.swagger.annotations.ApiModelProperty(value="",name="parameter") | ||||
| private String parameter; | private String parameter; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*修改时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="修改时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="修改时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /*状态,0 有效 1 无效**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="状态,0 有效 1 无效",name="status") | @io.swagger.annotations.ApiModelProperty(value="状态,0 有效 1 无效",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public Long getProductId() { | |||||
| return productId; | |||||
| } | |||||
| public void setProductId(Long productId) { | |||||
| this.productId = productId; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long merchantId) { | |||||
| this.merchantId = merchantId; | |||||
| } | |||||
| public String getParameter() { | |||||
| return parameter; | |||||
| } | |||||
| public void setParameter(String parameter) { | |||||
| this.parameter = parameter; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date createDate) { | |||||
| this.createDate = createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date updateDate) { | |||||
| this.updateDate = updateDate; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer status) { | |||||
| this.status = status; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -7,6 +9,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_coupon_type") | @Table(name = "wx_coupon_type") | ||||
| @Data | |||||
| public class WxCouponType implements Serializable { | public class WxCouponType implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -17,39 +20,9 @@ public class WxCouponType implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*券类型**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券类型",name="title") | @io.swagger.annotations.ApiModelProperty(value="券类型",name="title") | ||||
| private String title; | private String title; | ||||
| public String getTitle() { | |||||
| return title; | |||||
| } | |||||
| public void setTitle(String _title) { | |||||
| title = _title; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -43,46 +43,32 @@ public class WxCreditHistory implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="花费Str",name="spendStr") | @io.swagger.annotations.ApiModelProperty(value="花费Str",name="spendStr") | ||||
| private String spendStr; | private String spendStr; | ||||
| /**租户ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**用户ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") | ||||
| private Long cUserId; | private Long cUserId; | ||||
| /**总积分*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="总积分",name="creditAmount") | @io.swagger.annotations.ApiModelProperty(value="总积分",name="creditAmount") | ||||
| private Integer creditAmount; | private Integer creditAmount; | ||||
| /**每笔积分明细*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="每笔积分明细",name="creditNum") | @io.swagger.annotations.ApiModelProperty(value="每笔积分明细",name="creditNum") | ||||
| private Integer creditNum; | private Integer creditNum; | ||||
| /**积分类型*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10新增积分,11积分兑换,12消费积分 注:11积分兑换改为走订单接口",name="creditType") | @io.swagger.annotations.ApiModelProperty(value="积分类型 1每日登录,2消费,3绑车牌,4连接WIFI,5微信用户昵称授权,6微信用户手机授权,7完善个人信息,8积分导入,10新增积分,11积分兑换,12消费积分 注:11积分兑换改为走订单接口",name="creditType") | ||||
| private Integer creditType; | private Integer creditType; | ||||
| /**创建日期*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**小票URL*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="小票URL",name="receiptUrl") | @io.swagger.annotations.ApiModelProperty(value="小票URL",name="receiptUrl") | ||||
| private String receiptUrl; | private String receiptUrl; | ||||
| /**操作人类型*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="操作人类型 1:C端用户,2:A端会员,3:B端用户,4:A端用户",name="operatorType") | @io.swagger.annotations.ApiModelProperty(value="操作人类型 1:C端用户,2:A端会员,3:B端用户,4:A端用户",name="operatorType") | ||||
| private Integer operatorType; | private Integer operatorType; | ||||
| /**操作人ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") | @io.swagger.annotations.ApiModelProperty(value="操作人ID",name="operatorId") | ||||
| private Long operatorId; | private Long operatorId; | ||||
| /**商户ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /**券ID(积分兑换券时生成)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="券ID(积分兑换券时生成)",name="couponId") | @io.swagger.annotations.ApiModelProperty(value="券ID(积分兑换券时生成)",name="couponId") | ||||
| private Long couponId; | private Long couponId; | ||||
| /**业态ID(计算新增积分时使用)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="业态ID(计算新增积分时使用)",name="businessId") | @io.swagger.annotations.ApiModelProperty(value="业态ID(计算新增积分时使用)",name="businessId") | ||||
| private Long businessId; | private Long businessId; | ||||
| /**花费*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="花费",name="spend") | @io.swagger.annotations.ApiModelProperty(value="花费",name="spend") | ||||
| private Integer spend; | private Integer spend; | ||||
| /**兑换用途*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="兑换用途",name="changePurpose") | @io.swagger.annotations.ApiModelProperty(value="兑换用途",name="changePurpose") | ||||
| private String changePurpose; | private String changePurpose; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_date_amount_record") | @Table(name = "wx_date_amount_record") | ||||
| @Data | |||||
| public class WxDateAmountRecord implements Serializable { | public class WxDateAmountRecord implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,120 +21,27 @@ public class WxDateAmountRecord implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="日期",name="date") | @io.swagger.annotations.ApiModelProperty(value="日期",name="date") | ||||
| private Date date; | private Date date; | ||||
| /*周几 从1开始**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="周几 从1开始",name="dayOfWeek") | @io.swagger.annotations.ApiModelProperty(value="周几 从1开始",name="dayOfWeek") | ||||
| private Integer dayOfWeek; | private Integer dayOfWeek; | ||||
| /*一年第几周**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="一年第几周",name="weekOfYear") | @io.swagger.annotations.ApiModelProperty(value="一年第几周",name="weekOfYear") | ||||
| private Integer weekOfYear; | private Integer weekOfYear; | ||||
| /*金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="金额",name="payPrice") | @io.swagger.annotations.ApiModelProperty(value="金额",name="payPrice") | ||||
| private Integer payPrice; | private Integer payPrice; | ||||
| /*租户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*月份**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="月份",name="month") | @io.swagger.annotations.ApiModelProperty(value="月份",name="month") | ||||
| private Integer month; | private Integer month; | ||||
| /*商户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*创建日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新日期",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /*类型:0 交易记录 1.核销记录**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="类型:0 交易记录 1.核销记录",name="type") | @io.swagger.annotations.ApiModelProperty(value="类型:0 交易记录 1.核销记录",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| public Date getDate() { | |||||
| return date; | |||||
| } | |||||
| public void setDate(Date _date) { | |||||
| date = _date; | |||||
| } | |||||
| public Integer getDayOfWeek() { | |||||
| return dayOfWeek; | |||||
| } | |||||
| public void setDayOfWeek(Integer _dayOfWeek) { | |||||
| dayOfWeek = _dayOfWeek; | |||||
| } | |||||
| public Integer getWeekOfYear() { | |||||
| return weekOfYear; | |||||
| } | |||||
| public void setWeekOfYear(Integer _weekOfYear) { | |||||
| weekOfYear = _weekOfYear; | |||||
| } | |||||
| public Integer getPayPrice() { | |||||
| return payPrice; | |||||
| } | |||||
| public void setPayPrice(Integer _payPrice) { | |||||
| payPrice = _payPrice; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Integer getMonth() { | |||||
| return month; | |||||
| } | |||||
| public void setMonth(Integer _month) { | |||||
| month = _month; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer _type) { | |||||
| type = _type; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,27 +10,28 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_flow_record") | @Table(name = "wx_flow_record") | ||||
| @Data | |||||
| public class WxFlowRecord implements Serializable { | public class WxFlowRecord implements Serializable { | ||||
| private static final long serialVersionUID = 1849242743274278L; | private static final long serialVersionUID = 1849242743274278L; | ||||
| @Id | @Id | ||||
| private Long id; | private Long id; | ||||
| @io.swagger.annotations.ApiModelProperty(value="业务id",name="businessId") | @io.swagger.annotations.ApiModelProperty(value="业务id",name="businessId") | ||||
| private Long businessId; //业务id | |||||
| private Long businessId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="业务类型1合同审批2账单审批3合同终止",name="businessType") | @io.swagger.annotations.ApiModelProperty(value="业务类型1合同审批2账单审批3合同终止",name="businessType") | ||||
| private Integer businessType;//业务类型 1合同审批2账单审批 | |||||
| private Integer businessType; | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户id",name="userId") | @io.swagger.annotations.ApiModelProperty(value="用户id",name="userId") | ||||
| private Long userId;//用户id | |||||
| private Long userId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="姓名",name="userName") | @io.swagger.annotations.ApiModelProperty(value="姓名",name="userName") | ||||
| private String userName;//姓名 | |||||
| private String userName; | |||||
| @io.swagger.annotations.ApiModelProperty(value="审批意见",name="remark") | @io.swagger.annotations.ApiModelProperty(value="审批意见",name="remark") | ||||
| private String remark;//审批意见 | |||||
| private String remark; | |||||
| @io.swagger.annotations.ApiModelProperty(value="状态1发起申请2审批通过3审批驳回4待审批5合同作废6撤回",name="status") | @io.swagger.annotations.ApiModelProperty(value="状态1发起申请2审批通过3审批驳回4待审批5合同作废6撤回",name="status") | ||||
| private Integer status;//状态 1新建2审批3驳回4审批通过 | |||||
| private Integer status; | |||||
| @io.swagger.annotations.ApiModelProperty(value="任务id",name="taskId") | @io.swagger.annotations.ApiModelProperty(value="任务id",name="taskId") | ||||
| private String taskId;//任务id | |||||
| private String taskId; | |||||
| @io.swagger.annotations.ApiModelProperty(value="流程实例id",name="processInstanceId") | @io.swagger.annotations.ApiModelProperty(value="流程实例id",name="processInstanceId") | ||||
| private String processInstanceId;//流程实例id | |||||
| private String processInstanceId; | |||||
| //申请时间 | //申请时间 | ||||
| @io.swagger.annotations.ApiModelProperty(value="申请时间",name="startDate") | @io.swagger.annotations.ApiModelProperty(value="申请时间",name="startDate") | ||||
| private Date startDate; | private Date startDate; | ||||
| @@ -55,26 +58,6 @@ public class WxFlowRecord implements Serializable { | |||||
| @Transient | @Transient | ||||
| private Integer limit; | private Integer limit; | ||||
| public Date getStartDate() { | |||||
| return startDate; | |||||
| } | |||||
| public void setStartDate(Date startDate) { | |||||
| this.startDate = startDate; | |||||
| } | |||||
| public Integer getLimit() { | |||||
| return limit; | |||||
| } | |||||
| public void setLimit(Integer limit) { | |||||
| this.limit = limit; | |||||
| } | |||||
| public static long getSerialVersionUID() { | |||||
| return serialVersionUID; | |||||
| } | |||||
| public WxFlowRecord(){} | public WxFlowRecord(){} | ||||
| public WxFlowRecord(Long businessId){ | public WxFlowRecord(Long businessId){ | ||||
| this.businessId = businessId; | this.businessId = businessId; | ||||
| @@ -87,172 +70,4 @@ public class WxFlowRecord implements Serializable { | |||||
| this.businessId = businessId; | this.businessId = businessId; | ||||
| this.tenantId = tenantId; | this.tenantId = tenantId; | ||||
| } | } | ||||
| public String getVariables() { | |||||
| return variables; | |||||
| } | |||||
| public void setVariables(String variables) { | |||||
| this.variables = variables; | |||||
| } | |||||
| public String getContractType() { | |||||
| return contractType; | |||||
| } | |||||
| public void setContractType(String contractType) { | |||||
| this.contractType = contractType; | |||||
| } | |||||
| public String getContractNumber() { | |||||
| return contractNumber; | |||||
| } | |||||
| public void setContractNumber(String contractNumber) { | |||||
| this.contractNumber = contractNumber; | |||||
| } | |||||
| public Integer getEndProperty() { | |||||
| return endProperty; | |||||
| } | |||||
| public void setEndProperty(Integer endProperty) { | |||||
| this.endProperty = endProperty; | |||||
| } | |||||
| public Integer getCurrStatus() { | |||||
| return currStatus; | |||||
| } | |||||
| public void setCurrStatus(Integer currStatus) { | |||||
| this.currStatus = currStatus; | |||||
| } | |||||
| public Integer getIsLastStart() { | |||||
| return isLastStart; | |||||
| } | |||||
| public void setIsLastStart(Integer isLastStart) { | |||||
| this.isLastStart = isLastStart; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| public String getTaskKey() { | |||||
| return taskKey; | |||||
| } | |||||
| public void setTaskKey(String taskKey) { | |||||
| this.taskKey = taskKey; | |||||
| } | |||||
| public String getTaskName() { | |||||
| return taskName; | |||||
| } | |||||
| public void setTaskName(String taskName) { | |||||
| this.taskName = taskName; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public String getUserName() { | |||||
| return userName; | |||||
| } | |||||
| public void setUserName(String userName) { | |||||
| this.userName = userName; | |||||
| } | |||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public Long getBusinessId() { | |||||
| return businessId; | |||||
| } | |||||
| public void setBusinessId(Long businessId) { | |||||
| this.businessId = businessId; | |||||
| } | |||||
| public Integer getBusinessType() { | |||||
| return businessType; | |||||
| } | |||||
| public void setBusinessType(Integer businessType) { | |||||
| this.businessType = businessType; | |||||
| } | |||||
| public Long getUserId() { | |||||
| return userId; | |||||
| } | |||||
| public void setUserId(Long userId) { | |||||
| this.userId = userId; | |||||
| } | |||||
| public String getRemark() { | |||||
| return remark; | |||||
| } | |||||
| public void setRemark(String remark) { | |||||
| this.remark = remark; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer status) { | |||||
| this.status = status; | |||||
| } | |||||
| public String getTaskId() { | |||||
| return taskId; | |||||
| } | |||||
| public void setTaskId(String taskId) { | |||||
| this.taskId = taskId; | |||||
| } | |||||
| public String getProcessInstanceId() { | |||||
| return processInstanceId; | |||||
| } | |||||
| public void setProcessInstanceId(String processInstanceId) { | |||||
| this.processInstanceId = processInstanceId; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date createDate) { | |||||
| this.createDate = createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date updateDate) { | |||||
| this.updateDate = updateDate; | |||||
| } | |||||
| } | } | ||||
| @@ -22,47 +22,29 @@ public class WxGame implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| /** | |||||
| * 租户ID | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /** | |||||
| * 游戏模板ID | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "游戏模板ID", name = "gameId") | @io.swagger.annotations.ApiModelProperty(value = "游戏模板ID", name = "gameId") | ||||
| private Long gameId; | private Long gameId; | ||||
| /** | |||||
| * 游戏状态(0:上架,1:下架) | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "游戏状态(0:上架,1:下架)", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "游戏状态(0:上架,1:下架)", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| /** | |||||
| * 券列表 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "券列表", name = "couponIds") | @io.swagger.annotations.ApiModelProperty(value = "券列表", name = "couponIds") | ||||
| private String couponIds; | private String couponIds; | ||||
| /** | |||||
| * 有效日期-开始 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "有效日期-开始", name = "validStartDate") | @io.swagger.annotations.ApiModelProperty(value = "有效日期-开始", name = "validStartDate") | ||||
| private Date validStartDate; | private Date validStartDate; | ||||
| /** | |||||
| * 有效日期-结束 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "有效日期-结束", name = "validEndDate") | @io.swagger.annotations.ApiModelProperty(value = "有效日期-结束", name = "validEndDate") | ||||
| private Date validEndDate; | private Date validEndDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "触发条件(-1:不受限制,1:登录触发, 2:主页固定入口,3:购买触发,4:核销触发,5:公众号链接触发,6:二维码触发)", name = "triggleAction") | @io.swagger.annotations.ApiModelProperty(value = "触发条件(-1:不受限制,1:登录触发, 2:主页固定入口,3:购买触发,4:核销触发,5:公众号链接触发,6:二维码触发)", name = "triggleAction") | ||||
| private Integer triggleAction; | private Integer triggleAction; | ||||
| /** | |||||
| * 玩次数限制 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "限玩次数(0:不受限制,n:限玩次数)", name = "playLimit") | @io.swagger.annotations.ApiModelProperty(value = "限玩次数(0:不受限制,n:限玩次数)", name = "playLimit") | ||||
| private Integer playLimit; | private Integer playLimit; | ||||
| /** | |||||
| * 获奖次数限制 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "限奖次数(0:不受限制,n:限奖次数)", name = "awardLimit") | @io.swagger.annotations.ApiModelProperty(value = "限奖次数(0:不受限制,n:限奖次数)", name = "awardLimit") | ||||
| private Integer awardLimit; | private Integer awardLimit; | ||||
| @@ -70,28 +52,21 @@ public class WxGame implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "已投放券信息") | @io.swagger.annotations.ApiModelProperty(value = "已投放券信息") | ||||
| protected List<Object> couponIdsList; // couponChannel | protected List<Object> couponIdsList; // couponChannel | ||||
| /**游戏名称*/ | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="游戏名称",name="name") | @io.swagger.annotations.ApiModelProperty(value="游戏名称",name="name") | ||||
| private String name; | private String name; | ||||
| /**游戏链接*/ | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="游戏链接",name="url") | @io.swagger.annotations.ApiModelProperty(value="游戏链接",name="url") | ||||
| private String url; | private String url; | ||||
| /**游戏logo,c端游戏入口使用*/ | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="游戏logo,c端游戏入口使用",name="imgUrl") | @io.swagger.annotations.ApiModelProperty(value="游戏logo,c端游戏入口使用",name="imgUrl") | ||||
| private String imgUrl; | private String imgUrl; | ||||
| /**选项限制(-1:不做限制)*/ | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="选项限制(-1:不做限制)",name="optionLimit") | @io.swagger.annotations.ApiModelProperty(value="选项限制(-1:不做限制)",name="optionLimit") | ||||
| private Integer optionLimit; | private Integer optionLimit; | ||||
| /**游戏规则说明*/ | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="游戏规则说明",name="rules") | @io.swagger.annotations.ApiModelProperty(value="游戏规则说明",name="rules") | ||||
| private String rules; | private String rules; | ||||
| /**游戏类型(1:卡牌),目前无用*/ | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="游戏类型(1:卡牌),目前无用",name="type") | @io.swagger.annotations.ApiModelProperty(value="游戏类型(1:卡牌),目前无用",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| @@ -104,155 +79,6 @@ public class WxGame implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") | @io.swagger.annotations.ApiModelProperty(value="小程序二维码Scene",name="weappScene") | ||||
| private String weappScene; | private String weappScene; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public Long getGameId() { | |||||
| return gameId; | |||||
| } | |||||
| public void setGameId(Long gameId) { | |||||
| this.gameId = gameId; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer status) { | |||||
| this.status = status; | |||||
| } | |||||
| public String getCouponIds() { | |||||
| return couponIds; | |||||
| } | |||||
| public void setCouponIds(String couponIds) { | |||||
| this.couponIds = couponIds; | |||||
| } | |||||
| public Date getValidStartDate() { | |||||
| return validStartDate; | |||||
| } | |||||
| public void setValidStartDate(Date validStartDate) { | |||||
| this.validStartDate = validStartDate; | |||||
| } | |||||
| public Date getValidEndDate() { | |||||
| return validEndDate; | |||||
| } | |||||
| public void setValidEndDate(Date validEndDate) { | |||||
| this.validEndDate = validEndDate; | |||||
| } | |||||
| public Integer getTriggleAction() { | |||||
| return triggleAction; | |||||
| } | |||||
| public void setTriggleAction(Integer triggleAction) { | |||||
| this.triggleAction = triggleAction; | |||||
| } | |||||
| public Integer getPlayLimit() { | |||||
| return playLimit; | |||||
| } | |||||
| public void setPlayLimit(Integer playLimit) { | |||||
| this.playLimit = playLimit; | |||||
| } | |||||
| public List<Object> getCouponIdsList() { | |||||
| return couponIdsList; | |||||
| } | |||||
| public void setCouponIdsList(List<Object> couponIdsList) { | |||||
| this.couponIdsList = couponIdsList; | |||||
| } | |||||
| public Integer getAwardLimit() { | |||||
| return awardLimit; | |||||
| } | |||||
| public void setAwardLimit(Integer awardLimit) { | |||||
| this.awardLimit = awardLimit; | |||||
| } | |||||
| public String getName() { | |||||
| return name; | |||||
| } | |||||
| public void setName(String name) { | |||||
| this.name = name; | |||||
| } | |||||
| public String getUrl() { | |||||
| return url; | |||||
| } | |||||
| public void setUrl(String url) { | |||||
| this.url = url; | |||||
| } | |||||
| public String getImgUrl() { | |||||
| return imgUrl; | |||||
| } | |||||
| public void setImgUrl(String imgUrl) { | |||||
| this.imgUrl = imgUrl; | |||||
| } | |||||
| public Integer getOptionLimit() { | |||||
| return optionLimit; | |||||
| } | |||||
| public void setOptionLimit(Integer optionLimit) { | |||||
| this.optionLimit = optionLimit; | |||||
| } | |||||
| public String getRules() { | |||||
| return rules; | |||||
| } | |||||
| public void setRules(String rules) { | |||||
| this.rules = rules; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer type) { | |||||
| this.type = type; | |||||
| } | |||||
| public String getWeappPath() { | public String getWeappPath() { | ||||
| if (id == null) | if (id == null) | ||||
| return "pages/index/index"; | return "pages/index/index"; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_game_action_log") | @Table(name = "wx_game_action_log") | ||||
| @Data | |||||
| public class WxGameActionLog implements Serializable { | public class WxGameActionLog implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -26,100 +29,20 @@ public class WxGameActionLog implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected Date endTime; | protected Date endTime; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| public Date getStartTime() { | |||||
| return startTime; | |||||
| } | |||||
| public void setStartTime(Date startTime) { | |||||
| this.startTime = startTime; | |||||
| } | |||||
| public Date getEndTime() { | |||||
| return endTime; | |||||
| } | |||||
| public void setEndTime(Date endTime) { | |||||
| this.endTime = endTime; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*coupon id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="游戏ID",name="gameId") | @io.swagger.annotations.ApiModelProperty(value="游戏ID",name="gameId") | ||||
| private Long gameId; | private Long gameId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="couponOrderId") | @io.swagger.annotations.ApiModelProperty(value="",name="couponOrderId") | ||||
| private Long couponOrderId; | private Long couponOrderId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="userId") | @io.swagger.annotations.ApiModelProperty(value="",name="userId") | ||||
| private Long userId; | private Long userId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getCouponOrderId() { | |||||
| return couponOrderId; | |||||
| } | |||||
| public void setCouponOrderId(Long _couponOrderId) { | |||||
| couponOrderId = _couponOrderId; | |||||
| } | |||||
| public Long getGameId() { | |||||
| return gameId; | |||||
| } | |||||
| public void setGameId(Long gameId) { | |||||
| this.gameId = gameId; | |||||
| } | |||||
| public Long getUserId() { | |||||
| return userId; | |||||
| } | |||||
| public void setUserId(Long userId) { | |||||
| this.userId = userId; | |||||
| } | |||||
| public Date getCreateTime() { | |||||
| return createTime; | |||||
| } | |||||
| public void setCreateTime(Date createTime) { | |||||
| this.createTime = createTime; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -19,94 +19,20 @@ public class WxGameTemplate implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| /**游戏名称*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="游戏名称",name="name") | @io.swagger.annotations.ApiModelProperty(value="游戏名称",name="name") | ||||
| private String name; | private String name; | ||||
| /**游戏链接*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="游戏链接",name="url") | @io.swagger.annotations.ApiModelProperty(value="游戏链接",name="url") | ||||
| private String url; | private String url; | ||||
| /**游戏logo,c端游戏入口使用*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="游戏logo,c端游戏入口使用",name="imgUrl") | @io.swagger.annotations.ApiModelProperty(value="游戏logo,c端游戏入口使用",name="imgUrl") | ||||
| private String imgUrl; | private String imgUrl; | ||||
| /**选项限制(-1:不做限制)*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="选项限制(-1:不做限制)",name="optionLimit") | @io.swagger.annotations.ApiModelProperty(value="选项限制(-1:不做限制)",name="optionLimit") | ||||
| private Integer optionLimit; | private Integer optionLimit; | ||||
| /**游戏规则说明*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="游戏规则说明",name="rules") | @io.swagger.annotations.ApiModelProperty(value="游戏规则说明",name="rules") | ||||
| private String rules; | private String rules; | ||||
| /**游戏类型(1:卡牌),目前无用*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="游戏类型(1:卡牌),目前无用",name="type") | @io.swagger.annotations.ApiModelProperty(value="游戏类型(1:卡牌),目前无用",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public String getName() { | |||||
| return name; | |||||
| } | |||||
| public void setName(String name) { | |||||
| this.name = name; | |||||
| } | |||||
| public String getUrl() { | |||||
| return url; | |||||
| } | |||||
| public void setUrl(String url) { | |||||
| this.url = url; | |||||
| } | |||||
| public String getImgUrl() { | |||||
| return imgUrl; | |||||
| } | |||||
| public void setImgUrl(String imgUrl) { | |||||
| this.imgUrl = imgUrl; | |||||
| } | |||||
| public Integer getOptionLimit() { | |||||
| return optionLimit; | |||||
| } | |||||
| public void setOptionLimit(Integer optionLimit) { | |||||
| this.optionLimit = optionLimit; | |||||
| } | |||||
| public String getRules() { | |||||
| return rules; | |||||
| } | |||||
| public void setRules(String rules) { | |||||
| this.rules = rules; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer type) { | |||||
| this.type = type; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_group") | @Table(name = "wx_group") | ||||
| @Data | |||||
| public class WxGroup implements Serializable { | public class WxGroup implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,108 +22,25 @@ public class WxGroup implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public String getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(String id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*商场名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") | @io.swagger.annotations.ApiModelProperty(value="商场名",name="name") | ||||
| private String name; | private String name; | ||||
| /*国家**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="国家",name="country") | @io.swagger.annotations.ApiModelProperty(value="国家",name="country") | ||||
| private String country; | private String country; | ||||
| /*省**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="省",name="province") | @io.swagger.annotations.ApiModelProperty(value="省",name="province") | ||||
| private String province; | private String province; | ||||
| /*城市**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="城市",name="city") | @io.swagger.annotations.ApiModelProperty(value="城市",name="city") | ||||
| private String city; | private String city; | ||||
| /*地址**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") | @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") | ||||
| private String addr; | private String addr; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="longitude") | @io.swagger.annotations.ApiModelProperty(value="",name="longitude") | ||||
| private String longitude; | private String longitude; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="latitude") | @io.swagger.annotations.ApiModelProperty(value="",name="latitude") | ||||
| private String latitude; | private String latitude; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="logurl") | @io.swagger.annotations.ApiModelProperty(value="",name="logurl") | ||||
| private String logurl; | private String logurl; | ||||
| public String getName() { | |||||
| return name; | |||||
| } | |||||
| public void setName(String _name) { | |||||
| name = _name; | |||||
| } | |||||
| public String getCountry() { | |||||
| return country; | |||||
| } | |||||
| public void setCountry(String _country) { | |||||
| country = _country; | |||||
| } | |||||
| public String getProvince() { | |||||
| return province; | |||||
| } | |||||
| public void setProvince(String _province) { | |||||
| province = _province; | |||||
| } | |||||
| public String getCity() { | |||||
| return city; | |||||
| } | |||||
| public void setCity(String _city) { | |||||
| city = _city; | |||||
| } | |||||
| public String getAddr() { | |||||
| return addr; | |||||
| } | |||||
| public void setAddr(String _addr) { | |||||
| addr = _addr; | |||||
| } | |||||
| public String getLongitude() { | |||||
| return longitude; | |||||
| } | |||||
| public void setLongitude(String _longitude) { | |||||
| longitude = _longitude; | |||||
| } | |||||
| public String getLatitude() { | |||||
| return latitude; | |||||
| } | |||||
| public void setLatitude(String _latitude) { | |||||
| latitude = _latitude; | |||||
| } | |||||
| public Date getCreatetime() { | |||||
| return createtime; | |||||
| } | |||||
| public void setCreatetime(Date _createtime) { | |||||
| createtime = _createtime; | |||||
| } | |||||
| public String getLogurl() { | |||||
| return logurl; | |||||
| } | |||||
| public void setLogurl(String _logurl) { | |||||
| logurl = _logurl; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_level_config") | @Table(name = "wx_level_config") | ||||
| @Data | |||||
| public class WxLevelConfig implements Serializable { | public class WxLevelConfig implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,53 +21,25 @@ public class WxLevelConfig implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**成长值**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="成长值",name="points") | @io.swagger.annotations.ApiModelProperty(value="成长值",name="points") | ||||
| private Integer points; | private Integer points; | ||||
| /**等级**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="等级",name="level") | @io.swagger.annotations.ApiModelProperty(value="等级",name="level") | ||||
| private String level; | private String level; | ||||
| /**描述**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="描述",name="description") | @io.swagger.annotations.ApiModelProperty(value="描述",name="description") | ||||
| private String description; | private String description; | ||||
| /**创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /**会员权益**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="capability") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="capability") | ||||
| private String capability; | private String capability; | ||||
| /**是否启用,0:未启用,启用1,2,3,分别对应wx_merchant_discount里的rate_vip1, rate_vip2, rate_vip3**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否启用",name="discountEnable") | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否启用(0:未启用,启用1,2,3,分别对应wx_merchant_discount里的rate_vip1, rate_vip2, rate_vip3)",name="discountEnable") | |||||
| private Integer discountEnable; | private Integer discountEnable; | ||||
| @Transient | @Transient | ||||
| @@ -73,79 +48,6 @@ public class WxLevelConfig implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected Long userCount; | protected Long userCount; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Integer getPoints() { | |||||
| return points; | |||||
| } | |||||
| public void setPoints(Integer _points) { | |||||
| points = _points; | |||||
| } | |||||
| public String getLevel() { | |||||
| return level; | |||||
| } | |||||
| public void setLevel(String _level) { | |||||
| level = _level; | |||||
| } | |||||
| public String getDescription() { | |||||
| return description; | |||||
| } | |||||
| public void setDescription(String _description) { | |||||
| description = _description; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Long getCount() { | |||||
| return count; | |||||
| } | |||||
| public void setCount(Long count) { | |||||
| this.count = count; | |||||
| } | |||||
| public Integer getDiscountEnable() { | |||||
| return discountEnable; | |||||
| } | |||||
| public void setDiscountEnable(Integer discountEnable) { | |||||
| this.discountEnable = discountEnable; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date updateDate) { | |||||
| this.updateDate = updateDate; | |||||
| } | |||||
| public String getCapability() { | |||||
| return capability; | |||||
| } | |||||
| public void setCapability(String capability) { | |||||
| this.capability = capability; | |||||
| } | |||||
| public Long getUserCount() { | |||||
| return userCount; | |||||
| } | |||||
| public void setUserCount(Long userCount) { | |||||
| this.userCount = userCount; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_level_merchant") | @Table(name = "wx_level_merchant") | ||||
| @Data | |||||
| public class WxLevelMerchant implements Serializable { | public class WxLevelMerchant implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,86 +22,20 @@ public class WxLevelMerchant implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="等级ID",name="levelId") | @io.swagger.annotations.ApiModelProperty(value="等级ID",name="levelId") | ||||
| private Long levelId; | private Long levelId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*折扣率**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="0-100折扣",name="discount") | |||||
| @io.swagger.annotations.ApiModelProperty(value="折扣率(0-100折扣)",name="discount") | |||||
| private Integer discount; | private Integer discount; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long merchantId) { | |||||
| this.merchantId = merchantId; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date createDate) { | |||||
| this.createDate = createDate; | |||||
| } | |||||
| public Long getLevelId() { | |||||
| return levelId; | |||||
| } | |||||
| public void setLevelId(Long levelId) { | |||||
| this.levelId = levelId; | |||||
| } | |||||
| public Integer getDiscount() { | |||||
| return discount; | |||||
| } | |||||
| public void setDiscount(Integer discount) { | |||||
| this.discount = discount; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -23,26 +23,6 @@ public class WxMall implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_mall_apply") | @Table(name = "wx_mall_apply") | ||||
| @Data | |||||
| public class WxMallApply implements Serializable { | public class WxMallApply implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,71 +22,18 @@ public class WxMallApply implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @Transient | @Transient | ||||
| protected String verifyCode; | protected String verifyCode; | ||||
| /*购物中心名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="购物中心名称",name="mallName") | @io.swagger.annotations.ApiModelProperty(value="购物中心名称",name="mallName") | ||||
| private String mallName; | private String mallName; | ||||
| /*联系人姓名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="联系人姓名",name="applicant") | @io.swagger.annotations.ApiModelProperty(value="联系人姓名",name="applicant") | ||||
| private String applicant; | private String applicant; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="phone") | |||||
| @io.swagger.annotations.ApiModelProperty(value="申请人电话",name="phone") | |||||
| private String phone; | private String phone; | ||||
| /*申请时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="申请时间",name="applyDate") | @io.swagger.annotations.ApiModelProperty(value="申请时间",name="applyDate") | ||||
| private Date applyDate; | private Date applyDate; | ||||
| public String getMallName() { | |||||
| return mallName; | |||||
| } | |||||
| public void setMallName(String _mallName) { | |||||
| mallName = _mallName; | |||||
| } | |||||
| public String getApplicant() { | |||||
| return applicant; | |||||
| } | |||||
| public void setApplicant(String _applicant) { | |||||
| applicant = _applicant; | |||||
| } | |||||
| public String getPhone() { | |||||
| return phone; | |||||
| } | |||||
| public void setPhone(String _phone) { | |||||
| phone = _phone; | |||||
| } | |||||
| public Date getApplyDate() { | |||||
| return applyDate; | |||||
| } | |||||
| public void setApplyDate(Date _applyDate) { | |||||
| applyDate = _applyDate; | |||||
| } | |||||
| public String getVerifyCode() { | |||||
| return verifyCode; | |||||
| } | |||||
| public void setVerifyCode(String verifyCode) { | |||||
| this.verifyCode = verifyCode; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -21,26 +21,6 @@ public class WxMallFloor implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| @@ -11,6 +12,7 @@ import java.util.List; | |||||
| import java.util.UUID; | import java.util.UUID; | ||||
| @Table(name = "wx_merchant_b_user") | @Table(name = "wx_merchant_b_user") | ||||
| @Data | |||||
| public class WxMerchantBUser implements Serializable { | public class WxMerchantBUser implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -22,151 +24,29 @@ public class WxMerchantBUser implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*B端用户手机号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "phone") | @io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "phone") | ||||
| private String phone; | private String phone; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "", name = "userPwd") | @io.swagger.annotations.ApiModelProperty(value = "", name = "userPwd") | ||||
| private String userPwd; | private String userPwd; | ||||
| /*商户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") | @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") | @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /*小程序的appId**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "小程序的appId", name = "appId") | @io.swagger.annotations.ApiModelProperty(value = "小程序的appId", name = "appId") | ||||
| private String appId; | private String appId; | ||||
| /*用户登录用token**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "用户登录用token", name = "token") | @io.swagger.annotations.ApiModelProperty(value = "用户登录用token", name = "token") | ||||
| private String token; | private String token; | ||||
| /*用户过期时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "用户过期时间", name = "expireTime") | @io.swagger.annotations.ApiModelProperty(value = "用户过期时间", name = "expireTime") | ||||
| private Date expireTime; | private Date expireTime; | ||||
| /*b端用户姓名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "name") | @io.swagger.annotations.ApiModelProperty(value = "b端用户姓名", name = "name") | ||||
| private String name; | private String name; | ||||
| /*绑定状态1未绑定商户0已绑定商户**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "绑定状态1未绑定商户0已绑定商户", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "绑定状态1未绑定商户0已绑定商户", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getPhone() { | |||||
| return phone; | |||||
| } | |||||
| public void setPhone(String _phone) { | |||||
| phone = _phone; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public String getAppId() { | |||||
| return appId; | |||||
| } | |||||
| public void setAppId(String _appId) { | |||||
| appId = _appId; | |||||
| } | |||||
| public String getToken() { | |||||
| return token; | |||||
| } | |||||
| public void setToken(String _token) { | |||||
| token = _token; | |||||
| } | |||||
| public Date getExpireTime() { | |||||
| return expireTime; | |||||
| } | |||||
| public void setExpireTime(Date _expireTime) { | |||||
| expireTime = _expireTime; | |||||
| } | |||||
| public String getName() { | |||||
| return name; | |||||
| } | |||||
| public void setName(String _name) { | |||||
| this.name = _name; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer status) { | |||||
| this.status = status; | |||||
| } | |||||
| public String getUserPwd() { | |||||
| return userPwd; | |||||
| } | |||||
| public void setUserPwd(String userPwd) { | |||||
| this.userPwd = userPwd; | |||||
| } | |||||
| public static enum Field { | public static enum Field { | ||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | ||||
| TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), | TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_merchant_corp") | @Table(name = "wx_merchant_corp") | ||||
| @Data | |||||
| public class WxMerchantCorp implements Serializable { | public class WxMerchantCorp implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,152 +22,49 @@ public class WxMerchantCorp implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*商户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*法人证件类型1居民身份证2军官证3学生证4驾驶证6护照**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="法人证件类型1居民身份证2军官证3学生证4驾驶证5护照",name="corpPapersType") | @io.swagger.annotations.ApiModelProperty(value="法人证件类型1居民身份证2军官证3学生证4驾驶证5护照",name="corpPapersType") | ||||
| private Integer corpPapersType; | private Integer corpPapersType; | ||||
| /*法人证件号码**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="法人证件号码",name="corpPapersNumber") | @io.swagger.annotations.ApiModelProperty(value="法人证件号码",name="corpPapersNumber") | ||||
| private String corpPapersNumber; | private String corpPapersNumber; | ||||
| /*法人**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="法人",name="corpPapersPerson") | @io.swagger.annotations.ApiModelProperty(value="法人",name="corpPapersPerson") | ||||
| private String corpPapersPerson; | private String corpPapersPerson; | ||||
| /*法人证件正面**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="法人证件正面",name="corpPapersPicFace") | @io.swagger.annotations.ApiModelProperty(value="法人证件正面",name="corpPapersPicFace") | ||||
| private String corpPapersPicFace; | private String corpPapersPicFace; | ||||
| /*法人证件背面**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="法人证件背面",name="corpPapersPicBack") | @io.swagger.annotations.ApiModelProperty(value="法人证件背面",name="corpPapersPicBack") | ||||
| private String corpPapersPicBack; | private String corpPapersPicBack; | ||||
| /*注册地址**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="注册地址",name="corpPapersAddress") | @io.swagger.annotations.ApiModelProperty(value="注册地址",name="corpPapersAddress") | ||||
| private String corpPapersAddress; | private String corpPapersAddress; | ||||
| /*执照注册号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="执照注册号",name="corpPapersRegisterNumber") | @io.swagger.annotations.ApiModelProperty(value="执照注册号",name="corpPapersRegisterNumber") | ||||
| private String corpPapersRegisterNumber; | private String corpPapersRegisterNumber; | ||||
| /*执照文件**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="执照文件",name="corpPapersFile") | @io.swagger.annotations.ApiModelProperty(value="执照文件",name="corpPapersFile") | ||||
| private String corpPapersFile; | private String corpPapersFile; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Integer getCorpPapersType() { | |||||
| return corpPapersType; | |||||
| } | |||||
| public void setCorpPapersType(Integer _corpPapersType) { | |||||
| corpPapersType = _corpPapersType; | |||||
| } | |||||
| public String getCorpPapersNumber() { | |||||
| return corpPapersNumber; | |||||
| } | |||||
| public void setCorpPapersNumber(String _corpPapersNumber) { | |||||
| corpPapersNumber = _corpPapersNumber; | |||||
| } | |||||
| public String getCorpPapersPerson() { | |||||
| return corpPapersPerson; | |||||
| } | |||||
| public void setCorpPapersPerson(String _corpPapersPerson) { | |||||
| corpPapersPerson = _corpPapersPerson; | |||||
| } | |||||
| public String getCorpPapersPicFace() { | |||||
| return corpPapersPicFace; | |||||
| } | |||||
| public void setCorpPapersPicFace(String _corpPapersPicFace) { | |||||
| corpPapersPicFace = _corpPapersPicFace; | |||||
| } | |||||
| public String getCorpPapersPicBack() { | |||||
| return corpPapersPicBack; | |||||
| } | |||||
| public void setCorpPapersPicBack(String _corpPapersPicBack) { | |||||
| corpPapersPicBack = _corpPapersPicBack; | |||||
| } | |||||
| public String getCorpPapersAddress() { | |||||
| return corpPapersAddress; | |||||
| } | |||||
| public void setCorpPapersAddress(String _corpPapersAddress) { | |||||
| corpPapersAddress = _corpPapersAddress; | |||||
| } | |||||
| public String getCorpPapersRegisterNumber() { | |||||
| return corpPapersRegisterNumber; | |||||
| } | |||||
| public void setCorpPapersRegisterNumber(String _corpPapersRegisterNumber) { | |||||
| corpPapersRegisterNumber = _corpPapersRegisterNumber; | |||||
| } | |||||
| public String getCorpPapersFile() { | |||||
| return corpPapersFile; | |||||
| } | |||||
| public void setCorpPapersFile(String _corpPapersFile) { | |||||
| corpPapersFile = _corpPapersFile; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||||
| ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") | |||||
| ,CorpPapersType_ASC("`corpPapersType` ASC"),CorpPapersType_DESC("`corpPapersType` DESC") | |||||
| ,CorpPapersNumber_ASC("`corpPapersNumber` ASC"),CorpPapersNumber_DESC("`corpPapersNumber` DESC") | |||||
| ,CorpPapersPerson_ASC("`corpPapersPerson` ASC"),CorpPapersPerson_DESC("`corpPapersPerson` DESC") | |||||
| ,CorpPapersPicFace_ASC("`corpPapersPicFace` ASC"),CorpPapersPicFace_DESC("`corpPapersPicFace` DESC") | |||||
| ,CorpPapersPicBack_ASC("`corpPapersPicBack` ASC"),CorpPapersPicBack_DESC("`corpPapersPicBack` DESC") | |||||
| ,CorpPapersAddress_ASC("`corpPapersAddress` ASC"),CorpPapersAddress_DESC("`corpPapersAddress` DESC") | |||||
| ,CorpPapersRegisterNumber_ASC("`corpPapersRegisterNumber` ASC"),CorpPapersRegisterNumber_DESC("`corpPapersRegisterNumber` DESC") | |||||
| ,CorpPapersFile_ASC("`corpPapersFile` ASC"),CorpPapersFile_DESC("`corpPapersFile` DESC") | |||||
| ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") | |||||
| ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") | |||||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||||
| ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") | |||||
| ,CorpPapersType_ASC("`corp_papers_type` ASC"),CorpPapersType_DESC("`corp_papers_type` DESC") | |||||
| ,CorpPapersNumber_ASC("`corp_papers_number` ASC"),CorpPapersNumber_DESC("`corp_papers_number` DESC") | |||||
| ,CorpPapersPerson_ASC("`corp_papers_person` ASC"),CorpPapersPerson_DESC("`corp_papers_person` DESC") | |||||
| ,CorpPapersPicFace_ASC("`corp_papers_pic_face` ASC"),CorpPapersPicFace_DESC("`corp_papers_pic_face` DESC") | |||||
| ,CorpPapersPicBack_ASC("`corp_papers_pic_back` ASC"),CorpPapersPicBack_DESC("`corp_papers_pic_back` DESC") | |||||
| ,CorpPapersAddress_ASC("`corp_papers_address` ASC"),CorpPapersAddress_DESC("`corp_papers_address` DESC") | |||||
| ,CorpPapersRegisterNumber_ASC("`corp_papers_register_number` ASC"),CorpPapersRegisterNumber_DESC("`corp_papers_register_number` DESC") | |||||
| ,CorpPapersFile_ASC("`corp_papers_file` ASC"),CorpPapersFile_DESC("`corp_papers_file` DESC") | |||||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | |||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| Field(String value){ | Field(String value){ | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_merchant_shop") | @Table(name = "wx_merchant_shop") | ||||
| @Data | |||||
| public class WxMerchantShop implements Serializable { | public class WxMerchantShop implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,88 +21,21 @@ public class WxMerchantShop implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*商户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*商铺ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | ||||
| private Long shopId; | private Long shopId; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="删除状态",name="isDel") | @io.swagger.annotations.ApiModelProperty(value="删除状态",name="isDel") | ||||
| private Integer isDel; | private Integer isDel; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Long getShopId() { | |||||
| return shopId; | |||||
| } | |||||
| public void setShopId(Long _shopId) { | |||||
| shopId = _shopId; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public Integer getIsDel() { | |||||
| return isDel; | |||||
| } | |||||
| public void setIsDel(Integer isDel) { | |||||
| this.isDel = isDel; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_merchant_tax") | @Table(name = "wx_merchant_tax") | ||||
| @Data | |||||
| public class WxMerchantTax implements Serializable { | public class WxMerchantTax implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,163 +22,37 @@ public class WxMerchantTax implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*商户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*纳税人类型1一般纳税人2小规模纳税人**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="纳税人类型1一般纳税人2小规模纳税人",name="taxpayerType") | @io.swagger.annotations.ApiModelProperty(value="纳税人类型1一般纳税人2小规模纳税人",name="taxpayerType") | ||||
| private Integer taxpayerType; | private Integer taxpayerType; | ||||
| /*纳税证件类型1企业登记证2营业执照3组织机构代码证4税务登记证5银行开户许可证**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="纳税证件类型1企业登记证2营业执照3组织机构代码证4税务登记证5银行开户许可证",name="taxPapersType") | @io.swagger.annotations.ApiModelProperty(value="纳税证件类型1企业登记证2营业执照3组织机构代码证4税务登记证5银行开户许可证",name="taxPapersType") | ||||
| private Integer taxPapersType; | private Integer taxPapersType; | ||||
| /*纳税证件号码**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="纳税证件号码",name="taxPapersNumber") | @io.swagger.annotations.ApiModelProperty(value="纳税证件号码",name="taxPapersNumber") | ||||
| private String taxPapersNumber; | private String taxPapersNumber; | ||||
| /*发票类型1增值税专用发票2普通发票3定额发票**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="发票类型1增值税专用发票2普通发票3定额发票",name="invoiceType") | @io.swagger.annotations.ApiModelProperty(value="发票类型1增值税专用发票2普通发票3定额发票",name="invoiceType") | ||||
| private Integer invoiceType; | private Integer invoiceType; | ||||
| /*购方名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="购方名称",name="invoiceBuyer") | @io.swagger.annotations.ApiModelProperty(value="购方名称",name="invoiceBuyer") | ||||
| private String invoiceBuyer; | private String invoiceBuyer; | ||||
| /*纳税人识别号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="纳税人识别号",name="taxpayerIdentifyNumber") | @io.swagger.annotations.ApiModelProperty(value="纳税人识别号",name="taxpayerIdentifyNumber") | ||||
| private String taxpayerIdentifyNumber; | private String taxpayerIdentifyNumber; | ||||
| /*开票地址及电话**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="开票地址及电话",name="invoiceAddressPhone") | @io.swagger.annotations.ApiModelProperty(value="开票地址及电话",name="invoiceAddressPhone") | ||||
| private String invoiceAddressPhone; | private String invoiceAddressPhone; | ||||
| /*开户行及账号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="开户行及账号",name="bankAccountNumber") | @io.swagger.annotations.ApiModelProperty(value="开户行及账号",name="bankAccountNumber") | ||||
| private String bankAccountNumber; | private String bankAccountNumber; | ||||
| /*开户名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="开户名",name="bankAccountPerson") | @io.swagger.annotations.ApiModelProperty(value="开户名",name="bankAccountPerson") | ||||
| private String bankAccountPerson; | private String bankAccountPerson; | ||||
| /*银行名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="银行名称",name="bankName") | @io.swagger.annotations.ApiModelProperty(value="银行名称",name="bankName") | ||||
| private String bankName; | private String bankName; | ||||
| /*银行账号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="银行账号",name="bankAccount") | @io.swagger.annotations.ApiModelProperty(value="银行账号",name="bankAccount") | ||||
| private String bankAccount; | private String bankAccount; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Integer getTaxpayerType() { | |||||
| return taxpayerType; | |||||
| } | |||||
| public void setTaxpayerType(Integer _taxpayerType) { | |||||
| taxpayerType = _taxpayerType; | |||||
| } | |||||
| public Integer getTaxPapersType() { | |||||
| return taxPapersType; | |||||
| } | |||||
| public void setTaxPapersType(Integer _taxPapersType) { | |||||
| taxPapersType = _taxPapersType; | |||||
| } | |||||
| public String getTaxPapersNumber() { | |||||
| return taxPapersNumber; | |||||
| } | |||||
| public void setTaxPapersNumber(String _taxPapersNumber) { | |||||
| taxPapersNumber = _taxPapersNumber; | |||||
| } | |||||
| public Integer getInvoiceType() { | |||||
| return invoiceType; | |||||
| } | |||||
| public void setInvoiceType(Integer _invoiceType) { | |||||
| invoiceType = _invoiceType; | |||||
| } | |||||
| public String getInvoiceBuyer() { | |||||
| return invoiceBuyer; | |||||
| } | |||||
| public void setInvoiceBuyer(String _invoiceBuyer) { | |||||
| invoiceBuyer = _invoiceBuyer; | |||||
| } | |||||
| public String getTaxpayerIdentifyNumber() { | |||||
| return taxpayerIdentifyNumber; | |||||
| } | |||||
| public void setTaxpayerIdentifyNumber(String _taxpayerIdentifyNumber) { | |||||
| taxpayerIdentifyNumber = _taxpayerIdentifyNumber; | |||||
| } | |||||
| public String getInvoiceAddressPhone() { | |||||
| return invoiceAddressPhone; | |||||
| } | |||||
| public void setInvoiceAddressPhone(String _invoiceAddressPhone) { | |||||
| invoiceAddressPhone = _invoiceAddressPhone; | |||||
| } | |||||
| public String getBankAccountNumber() { | |||||
| return bankAccountNumber; | |||||
| } | |||||
| public void setBankAccountNumber(String _bankAccountNumber) { | |||||
| bankAccountNumber = _bankAccountNumber; | |||||
| } | |||||
| public String getBankAccountPerson() { | |||||
| return bankAccountPerson; | |||||
| } | |||||
| public void setBankAccountPerson(String _bankAccountPerson) { | |||||
| bankAccountPerson = _bankAccountPerson; | |||||
| } | |||||
| public String getBankName() { | |||||
| return bankName; | |||||
| } | |||||
| public void setBankName(String _bankName) { | |||||
| bankName = _bankName; | |||||
| } | |||||
| public String getBankAccount() { | |||||
| return bankAccount; | |||||
| } | |||||
| public void setBankAccount(String _bankAccount) { | |||||
| bankAccount = _bankAccount; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_merchant_trade_daily") | @Table(name = "wx_merchant_trade_daily") | ||||
| @Data | |||||
| public class WxMerchantTradeDaily implements Serializable { | public class WxMerchantTradeDaily implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,153 +22,33 @@ public class WxMerchantTradeDaily implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*商户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | @io.swagger.annotations.ApiModelProperty(value = "商户id", name = "merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*b用户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId") | @io.swagger.annotations.ApiModelProperty(value = "b用户id", name = "bUserId") | ||||
| private Long bUserId; | private Long bUserId; | ||||
| /*交易额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") | @io.swagger.annotations.ApiModelProperty(value = "交易额", name = "tradeAmt") | ||||
| private Integer tradeAmt; | private Integer tradeAmt; | ||||
| /*提交日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "解单提交日期", name = "createDate") | @io.swagger.annotations.ApiModelProperty(value = "解单提交日期", name = "createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "解单更新日期", name = "updateDate") | @io.swagger.annotations.ApiModelProperty(value = "解单更新日期", name = "updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /*解单日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "解单日期", name = "reportDate") | @io.swagger.annotations.ApiModelProperty(value = "解单日期", name = "reportDate") | ||||
| private String reportDate; | private String reportDate; | ||||
| /*交易笔数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "交易笔数", name = "tradeCount") | @io.swagger.annotations.ApiModelProperty(value = "交易笔数", name = "tradeCount") | ||||
| private Integer tradeCount; | private Integer tradeCount; | ||||
| /*凭证**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "凭证", name = "proof") | @io.swagger.annotations.ApiModelProperty(value = "凭证", name = "proof") | ||||
| private String proof; | private String proof; | ||||
| /*月份*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "月份如2019-05", name = "month") | @io.swagger.annotations.ApiModelProperty(value = "月份如2019-05", name = "month") | ||||
| @Transient | @Transient | ||||
| private String month; | private String month; | ||||
| /*是否是当天*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "是否是当天 1是", name = "isToday") | @io.swagger.annotations.ApiModelProperty(value = "是否是当天 1是", name = "isToday") | ||||
| @Transient | @Transient | ||||
| private Integer isToday; | private Integer isToday; | ||||
| public Integer getIsToday() { | |||||
| return isToday; | |||||
| } | |||||
| public void setIsToday(Integer isToday) { | |||||
| this.isToday = isToday; | |||||
| } | |||||
| public String getMonth() { | |||||
| return month; | |||||
| } | |||||
| public void setMonth(String month) { | |||||
| this.month = month; | |||||
| } | |||||
| public Integer getTradeCount() { | |||||
| return tradeCount; | |||||
| } | |||||
| public void setTradeCount(Integer tradeCount) { | |||||
| this.tradeCount = tradeCount; | |||||
| } | |||||
| public String getProof() { | |||||
| return proof; | |||||
| } | |||||
| public void setProof(String proof) { | |||||
| this.proof = proof; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Long getbUserId() { | |||||
| return bUserId; | |||||
| } | |||||
| public void setbUserId(Long bUserId) { | |||||
| this.bUserId = bUserId; | |||||
| } | |||||
| public Integer getTradeAmt() { | |||||
| return tradeAmt; | |||||
| } | |||||
| public void setTradeAmt(Integer _tradeAmt) { | |||||
| tradeAmt = _tradeAmt; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public String getReportDate() { | |||||
| return reportDate; | |||||
| } | |||||
| public void setReportDate(String _reportDate) { | |||||
| reportDate = _reportDate; | |||||
| } | |||||
| public static enum Field { | public static enum Field { | ||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | ||||
| TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), | TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -7,6 +9,7 @@ import java.io.Serializable; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_msg_config") | @Table(name = "wx_msg_config") | ||||
| @Data | |||||
| public class WxMsgConfig implements Serializable { | public class WxMsgConfig implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -17,66 +20,32 @@ public class WxMsgConfig implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="secret") | @io.swagger.annotations.ApiModelProperty(value="",name="secret") | ||||
| private String secret; | private String secret; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="publickey") | @io.swagger.annotations.ApiModelProperty(value="",name="publickey") | ||||
| private String publickey; | private String publickey; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="bid") | @io.swagger.annotations.ApiModelProperty(value="",name="bid") | ||||
| private String bid; | private String bid; | ||||
| /*充值条数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="充值条数",name="recharge") | @io.swagger.annotations.ApiModelProperty(value="充值条数",name="recharge") | ||||
| private Long recharge; | private Long recharge; | ||||
| /*剩余条数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="剩余条数",name="remains") | @io.swagger.annotations.ApiModelProperty(value="剩余条数",name="remains") | ||||
| private Long remains; | private Long remains; | ||||
| /*短信总数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="短信总数",name="total") | @io.swagger.annotations.ApiModelProperty(value="短信总数",name="total") | ||||
| private Long total; | private Long total; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="account") | @io.swagger.annotations.ApiModelProperty(value="",name="account") | ||||
| private String account; | private String account; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="reminderstatus") | @io.swagger.annotations.ApiModelProperty(value="",name="reminderstatus") | ||||
| private Integer reminderstatus; | private Integer reminderstatus; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="reminder") | @io.swagger.annotations.ApiModelProperty(value="",name="reminder") | ||||
| private Long reminder; | private Long reminder; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="phone") | @io.swagger.annotations.ApiModelProperty(value="",name="phone") | ||||
| private String phone; | private String phone; | ||||
| /*回调地址**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="回调地址",name="notifyurl") | @io.swagger.annotations.ApiModelProperty(value="回调地址",name="notifyurl") | ||||
| private String notifyurl; | private String notifyurl; | ||||
| /*模板回调地址**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="模板回调地址",name="modelnotifyurl") | @io.swagger.annotations.ApiModelProperty(value="模板回调地址",name="modelnotifyurl") | ||||
| private String modelnotifyurl; | private String modelnotifyurl; | ||||
| @@ -86,109 +55,10 @@ public class WxMsgConfig implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="appid",name="appid") | @io.swagger.annotations.ApiModelProperty(value="appid",name="appid") | ||||
| private String appid; | private String appid; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getSecret() { | |||||
| return secret; | |||||
| } | |||||
| public void setSecret(String _secret) { | |||||
| secret = _secret; | |||||
| } | |||||
| public String getPublickey() { | |||||
| return publickey; | |||||
| } | |||||
| public void setPublickey(String _publickey) { | |||||
| publickey = _publickey; | |||||
| } | |||||
| public String getBid() { | |||||
| return bid; | |||||
| } | |||||
| public void setBid(String _bid) { | |||||
| bid = _bid; | |||||
| } | |||||
| public Long getRecharge() { | |||||
| return recharge; | |||||
| } | |||||
| public void setRecharge(Long _recharge) { | |||||
| recharge = _recharge; | |||||
| } | |||||
| public Long getRemains() { | |||||
| return remains; | |||||
| } | |||||
| public void setRemains(Long _remains) { | |||||
| remains = _remains; | |||||
| } | |||||
| public Long getTotal() { | |||||
| return total; | |||||
| } | |||||
| public void setTotal(Long _total) { | |||||
| total = _total; | |||||
| } | |||||
| public String getAccount() { | |||||
| return account; | |||||
| } | |||||
| public void setAccount(String _account) { | |||||
| account = _account; | |||||
| } | |||||
| public Integer getReminderstatus() { | |||||
| return reminderstatus; | |||||
| } | |||||
| public void setReminderstatus(Integer _reminderstatus) { | |||||
| reminderstatus = _reminderstatus; | |||||
| } | |||||
| public Long getReminder() { | |||||
| return reminder; | |||||
| } | |||||
| public void setReminder(Long _reminder) { | |||||
| reminder = _reminder; | |||||
| } | |||||
| public String getPhone() { | |||||
| return phone; | |||||
| } | |||||
| public void setPhone(String _phone) { | |||||
| phone = _phone; | |||||
| } | |||||
| public String getNotifyurl() { | |||||
| return notifyurl; | |||||
| } | |||||
| public void setNotifyurl(String _notifyurl) { | |||||
| notifyurl = _notifyurl; | |||||
| } | |||||
| public String getModelnotifyurl() { | |||||
| return modelnotifyurl; | |||||
| } | |||||
| public void setModelnotifyurl(String modelnotifyurl) { | |||||
| this.modelnotifyurl = modelnotifyurl; | |||||
| } | |||||
| public String getVerifynotifyurl() { | |||||
| return verifynotifyurl; | |||||
| } | |||||
| public void setVerifynotifyurl(String verifynotifyurl) { | |||||
| this.verifynotifyurl = verifynotifyurl; | |||||
| } | |||||
| public String getAppid() { | |||||
| return appid; | |||||
| } | |||||
| public void setAppid(String appid) { | |||||
| this.appid = appid; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||||
| ,Secret_ASC("`secret` ASC"),Secret_DESC("`secret` DESC") | ,Secret_ASC("`secret` ASC"),Secret_DESC("`secret` DESC") | ||||
| ,Publickey_ASC("`publickey` ASC"),Publickey_DESC("`publickey` DESC") | ,Publickey_ASC("`publickey` ASC"),Publickey_DESC("`publickey` DESC") | ||||
| ,Bid_ASC("`bid` ASC"),Bid_DESC("`bid` DESC") | ,Bid_ASC("`bid` ASC"),Bid_DESC("`bid` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_msg_validationcode") | @Table(name = "wx_msg_validationcode") | ||||
| @Data | |||||
| public class WxMsgValidationcode implements Serializable { | public class WxMsgValidationcode implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,48 +22,21 @@ public class WxMsgValidationcode implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="phone") | @io.swagger.annotations.ApiModelProperty(value="",name="phone") | ||||
| private String phone; | private String phone; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="expiretime") | @io.swagger.annotations.ApiModelProperty(value="",name="expiretime") | ||||
| private Date expiretime; | private Date expiretime; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| /*场景 1 登录 2买券 3停车 4审批流通知**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="场景 1 登录 2买券 3停车 4审批流通知",name="type") | @io.swagger.annotations.ApiModelProperty(value="场景 1 登录 2买券 3停车 4审批流通知",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*内容**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="内容",name="msg") | @io.swagger.annotations.ApiModelProperty(value="内容",name="msg") | ||||
| private String msg; | private String msg; | ||||
| /*签名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") | @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") | ||||
| private String signature; | private String signature; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="code") | @io.swagger.annotations.ApiModelProperty(value="",name="code") | ||||
| private String code; | private String code; | ||||
| @@ -70,71 +46,6 @@ public class WxMsgValidationcode implements Serializable { | |||||
| @Transient | @Transient | ||||
| private String createtimeStr; | private String createtimeStr; | ||||
| public String getCreatetimeStr() { | |||||
| return createtimeStr; | |||||
| } | |||||
| public void setCreatetimeStr(String createtimeStr) { | |||||
| this.createtimeStr = createtimeStr; | |||||
| } | |||||
| public String getPhone() { | |||||
| return phone; | |||||
| } | |||||
| public void setPhone(String _phone) { | |||||
| phone = _phone; | |||||
| } | |||||
| public Date getExpiretime() { | |||||
| return expiretime; | |||||
| } | |||||
| public void setExpiretime(Date _expiretime) { | |||||
| expiretime = _expiretime; | |||||
| } | |||||
| public Date getCreatetime() { | |||||
| return createtime; | |||||
| } | |||||
| public void setCreatetime(Date _createtime) { | |||||
| createtime = _createtime; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer _type) { | |||||
| type = _type; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getMsg() { | |||||
| return msg; | |||||
| } | |||||
| public void setMsg(String _msg) { | |||||
| msg = _msg; | |||||
| } | |||||
| public String getSignature() { | |||||
| return signature; | |||||
| } | |||||
| public void setSignature(String _signature) { | |||||
| signature = _signature; | |||||
| } | |||||
| public String getCode() { | |||||
| return code; | |||||
| } | |||||
| public void setCode(String _code) { | |||||
| code = _code; | |||||
| } | |||||
| public String getAppid() { | |||||
| return appid; | |||||
| } | |||||
| public void setAppid(String appid) { | |||||
| this.appid = appid; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_msg_validationcode_model") | @Table(name = "wx_msg_validationcode_model") | ||||
| @Data | |||||
| public class WxMsgValidationcodeModel implements Serializable { | public class WxMsgValidationcodeModel implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,48 +22,22 @@ public class WxMsgValidationcodeModel implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | ||||
| private String name; | private String name; | ||||
| /*签名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") | @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") | ||||
| private String signature; | private String signature; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="content") | @io.swagger.annotations.ApiModelProperty(value="",name="content") | ||||
| private String content; | private String content; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| /*审核状态 0未通过 1 通过 2审核中**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="审核状态 0未通过 1 通过 2审核中",name="status") | @io.swagger.annotations.ApiModelProperty(value="审核状态 0未通过 1 通过 2审核中",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| /*有效分钟数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="有效分钟数",name="minutes") | @io.swagger.annotations.ApiModelProperty(value="有效分钟数",name="minutes") | ||||
| private Integer minutes; | private Integer minutes; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="modelId") | @io.swagger.annotations.ApiModelProperty(value="",name="modelId") | ||||
| private Integer modelId; | private Integer modelId; | ||||
| /*场景**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="场景",name="type") | @io.swagger.annotations.ApiModelProperty(value="场景",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| @@ -70,71 +47,6 @@ public class WxMsgValidationcodeModel implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="邮箱背景图片",name="emailBgImg") | @io.swagger.annotations.ApiModelProperty(value="邮箱背景图片",name="emailBgImg") | ||||
| private String emailBgImg; | private String emailBgImg; | ||||
| public String getEmailBgImg() { | |||||
| return emailBgImg; | |||||
| } | |||||
| public void setEmailBgImg(String emailBgImg) { | |||||
| this.emailBgImg = emailBgImg; | |||||
| } | |||||
| public String getName() { | |||||
| return name; | |||||
| } | |||||
| public void setName(String _name) { | |||||
| name = _name; | |||||
| } | |||||
| public String getSignature() { | |||||
| return signature; | |||||
| } | |||||
| public void setSignature(String _signature) { | |||||
| signature = _signature; | |||||
| } | |||||
| public String getContent() { | |||||
| return content; | |||||
| } | |||||
| public void setContent(String _content) { | |||||
| content = _content; | |||||
| } | |||||
| public Date getCreatetime() { | |||||
| return createtime; | |||||
| } | |||||
| public void setCreatetime(Date _createtime) { | |||||
| createtime = _createtime; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer _status) { | |||||
| status = _status; | |||||
| } | |||||
| public Integer getMinutes() { | |||||
| return minutes; | |||||
| } | |||||
| public void setMinutes(Integer _minutes) { | |||||
| minutes = _minutes; | |||||
| } | |||||
| public Integer getModelId() { | |||||
| return modelId; | |||||
| } | |||||
| public void setModelId(Integer _modelId) { | |||||
| modelId = _modelId; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer _type) { | |||||
| type = _type; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -144,7 +56,7 @@ public class WxMsgValidationcodeModel implements Serializable { | |||||
| ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") | ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") | ||||
| ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") | ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") | ||||
| ,Minutes_ASC("`minutes` ASC"),Minutes_DESC("`minutes` DESC") | ,Minutes_ASC("`minutes` ASC"),Minutes_DESC("`minutes` DESC") | ||||
| ,ModelId_ASC("`modelId` ASC"),ModelId_DESC("`modelId` DESC") | |||||
| ,ModelId_ASC("`model_id` ASC"),ModelId_DESC("`model_id` DESC") | |||||
| ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") | ||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| @@ -1,5 +1,10 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import lombok.ToString; | |||||
| import org.checkerframework.framework.qual.EnsuresQualifier; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +13,9 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_order") | @Table(name = "wx_order") | ||||
| @Data | |||||
| @ToString(callSuper = true) | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxOrder extends BaseEntity { | public class WxOrder extends BaseEntity { | ||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -16,14 +24,6 @@ public class WxOrder extends BaseEntity { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| @Override | @Override | ||||
| public String getSortColumns() { | public String getSortColumns() { | ||||
| @@ -31,14 +31,6 @@ public class WxOrder extends BaseEntity { | |||||
| return super.getSortColumns(); | return super.getSortColumns(); | ||||
| } | } | ||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @Transient | @Transient | ||||
| private String merchantName; | private String merchantName; | ||||
| @@ -94,182 +86,6 @@ public class WxOrder extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| protected String statusStr; | protected String statusStr; | ||||
| public Long getOrderNumber() { | |||||
| return orderNumber; | |||||
| } | |||||
| public void setOrderNumber(Long _orderNumber) { | |||||
| orderNumber = _orderNumber; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer type) { | |||||
| this.type = type; | |||||
| } | |||||
| public Integer getPaymentType() { | |||||
| return paymentType; | |||||
| } | |||||
| public void setPaymentType(Integer _paymentType) { | |||||
| paymentType = _paymentType; | |||||
| } | |||||
| public Integer getPayment() { | |||||
| return payment; | |||||
| } | |||||
| public void setPayment(Integer _payment) { | |||||
| payment = _payment; | |||||
| } | |||||
| public Date getPaymentTime() { | |||||
| return paymentTime; | |||||
| } | |||||
| public void setPaymentTime(Date _paymentTime) { | |||||
| paymentTime = _paymentTime; | |||||
| } | |||||
| public Integer getOrderStatus() { | |||||
| return orderStatus; | |||||
| } | |||||
| public void setOrderStatus(Integer _orderStatus) { | |||||
| orderStatus = _orderStatus; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public String getDetail() { | |||||
| return detail; | |||||
| } | |||||
| public void setDetail(String _detail) { | |||||
| detail = _detail; | |||||
| } | |||||
| public String getMerchantName() { | |||||
| return merchantName; | |||||
| } | |||||
| public void setMerchantName(String merchantName) { | |||||
| this.merchantName = merchantName; | |||||
| } | |||||
| public Long getcUserId() { | |||||
| return cUserId; | |||||
| } | |||||
| public void setcUserId(Long cUserId) { | |||||
| this.cUserId = cUserId; | |||||
| } | |||||
| public Long getCUserId() { | |||||
| return cUserId; | |||||
| } | |||||
| public void setCUserId(Long _cUserId) { | |||||
| cUserId = _cUserId; | |||||
| } | |||||
| public Long getCouponChannelId() { | |||||
| return couponChannelId; | |||||
| } | |||||
| public void setCouponChannelId(Long couponChannelId) { | |||||
| this.couponChannelId = couponChannelId; | |||||
| } | |||||
| public Long getProductId() { | |||||
| return productId; | |||||
| } | |||||
| public void setProductId(Long productId) { | |||||
| this.productId = productId; | |||||
| } | |||||
| public String getcUserName() { | |||||
| return cUserName; | |||||
| } | |||||
| public void setcUserName(String cUserName) { | |||||
| this.cUserName = cUserName; | |||||
| } | |||||
| public String getPhone() { | |||||
| return phone; | |||||
| } | |||||
| public void setPhone(String phone) { | |||||
| this.phone = phone; | |||||
| } | |||||
| public Date getPressEndDate() { | |||||
| return pressEndDate; | |||||
| } | |||||
| public void setPressEndDate(Date pressEndDate) { | |||||
| this.pressEndDate = pressEndDate; | |||||
| } | |||||
| public Integer getPressCurrentNum() { | |||||
| return pressCurrentNum; | |||||
| } | |||||
| public void setPressCurrentNum(Integer pressCurrentNum) { | |||||
| this.pressCurrentNum = pressCurrentNum; | |||||
| } | |||||
| public Integer getPressCurrentValue() { | |||||
| return pressCurrentValue; | |||||
| } | |||||
| public void setPressCurrentValue(Integer pressCurrentValue) { | |||||
| this.pressCurrentValue = pressCurrentValue; | |||||
| } | |||||
| public List<Integer> getStatusS() { | |||||
| return statusS; | |||||
| } | |||||
| public void setStatusS(List<Integer> statusS) { | |||||
| this.statusS = statusS; | |||||
| } | |||||
| public String getStatusStr() { | |||||
| return statusStr; | |||||
| } | |||||
| public void setStatusStr(String statusStr) { | |||||
| this.statusStr = statusStr; | |||||
| } | |||||
| public Long getOrderGroupId() { | |||||
| return orderGroupId; | |||||
| } | |||||
| public void setOrderGroupId(Long orderGroupId) { | |||||
| this.orderGroupId = orderGroupId; | |||||
| } | |||||
| public String getFormId() { | |||||
| return formId; | |||||
| } | |||||
| public void setFormId(String formId) { | |||||
| this.formId = formId; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -22,67 +22,22 @@ public class WxOrderGroup implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /** | |||||
| * 租户ID | |||||
| **/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /** | |||||
| * 订单ID | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "订单ID", name = "orderId") | @io.swagger.annotations.ApiModelProperty(value = "订单ID", name = "orderId") | ||||
| private Long orderId; | private Long orderId; | ||||
| /** | |||||
| * 券ID | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "参与人ID", name = "userId") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "券ID", name = "couponId") | |||||
| private Long couponId; | private Long couponId; | ||||
| /** | |||||
| * 剩余人数 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "剩余人数", name = "remainPeople") | @io.swagger.annotations.ApiModelProperty(value = "剩余人数", name = "remainPeople") | ||||
| private Integer remainPeople; | private Integer remainPeople; | ||||
| /** | |||||
| * 过期时间 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "过期时间", name = "expiredDate") | @io.swagger.annotations.ApiModelProperty(value = "过期时间", name = "expiredDate") | ||||
| private Date expiredDate; | private Date expiredDate; | ||||
| /** | |||||
| * 创建时间 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") | @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /** | |||||
| * 更新时间 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") | @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /** | |||||
| * 状态 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "状态", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "状态", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") | @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") | ||||
| private Long userId; | private Long userId; | ||||
| @@ -22,22 +22,16 @@ public class WxOrderPress implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**订单ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") | @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") | ||||
| private Long orderId; | private Long orderId; | ||||
| /**砍价参与人ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价参与人ID",name="userId") | @io.swagger.annotations.ApiModelProperty(value="砍价参与人ID",name="userId") | ||||
| private Long userId; | private Long userId; | ||||
| /**砍下来的价值*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍下来的价值",name="pressValue") | @io.swagger.annotations.ApiModelProperty(value="砍下来的价值",name="pressValue") | ||||
| private Integer pressValue; | private Integer pressValue; | ||||
| /**砍价时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="砍价时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**是否发起人*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否发起人",name="first") | @io.swagger.annotations.ApiModelProperty(value="是否发起人",name="first") | ||||
| private Integer first; | private Integer first; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_park") | @Table(name = "wx_park") | ||||
| @Data | |||||
| public class WxPark implements Serializable { | public class WxPark implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,146 +21,32 @@ public class WxPark implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**停车场图片**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车场图片",name="imgUrl") | @io.swagger.annotations.ApiModelProperty(value="停车场图片",name="imgUrl") | ||||
| private String imgUrl; | private String imgUrl; | ||||
| /**停车场地址**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车场地址",name="addr") | @io.swagger.annotations.ApiModelProperty(value="停车场地址",name="addr") | ||||
| private String addr; | private String addr; | ||||
| /**车位数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="车位数",name="number") | @io.swagger.annotations.ApiModelProperty(value="车位数",name="number") | ||||
| private Integer number; | private Integer number; | ||||
| /**出入口数量**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="出入口数量",name="entryExit") | @io.swagger.annotations.ApiModelProperty(value="出入口数量",name="entryExit") | ||||
| private Integer entryExit; | private Integer entryExit; | ||||
| /**停车费**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="停车费",name="stopFee") | @io.swagger.annotations.ApiModelProperty(value="停车费",name="stopFee") | ||||
| private String stopFee; | private String stopFee; | ||||
| /**创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /**第三方停车场ID(密文)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="第三方停车场ID(密文)",name="parkId") | @io.swagger.annotations.ApiModelProperty(value="第三方停车场ID(密文)",name="parkId") | ||||
| private String parkId; | private String parkId; | ||||
| /**第三方停车场ID(明文)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="第三方停车场ID(明文)",name="parkingId") | @io.swagger.annotations.ApiModelProperty(value="第三方停车场ID(明文)",name="parkingId") | ||||
| private String parkingId; | private String parkingId; | ||||
| /**厂商类型(1:ETCP,2:停简单)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="厂商类型(1:ETCP,2:停简单)",name="vendorType") | @io.swagger.annotations.ApiModelProperty(value="厂商类型(1:ETCP,2:停简单)",name="vendorType") | ||||
| private Integer vendorType; | private Integer vendorType; | ||||
| /**厂商参数etcp{"url":"http://mapi.test.etcp.cn","appId":"FMLK","merchantNo":"C7AEAF80BA8C44ADB42F3DB3CBC7D18A","merchantKey":"C292FFC7DCFB46AFB02792CD43F6DCC7","version": "1.0.0","parkId":"Wj7YdvqyiYM="},TJD{"url":"http://prep.tingjiandan.com/openapi/gateway","partner":"7dbc8ec9037d403b822cb60addfdc681","key":"f356cb1bf5a74fb7a564e86128d2c49f","version":"1.0"}**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="厂商参数etcp{\"url\":\"http://mapi.test.etcp.cn\",\"appId\":\"FMLK\",\"merchantNo\":\"C7AEAF80BA8C44ADB42F3DB3CBC7D18A\",\"merchantKey\":\"C292FFC7DCFB46AFB02792CD43F6DCC7\",\"version\": \"1.0.0\",\"parkId\":\"Wj7YdvqyiYM=\"},TJD{\"url\":\"http://prep.tingjiandan.com/openapi/gateway\",\"partner\":\"7dbc8ec9037d403b822cb60addfdc681\",\"key\":\"f356cb1bf5a74fb7a564e86128d2c49f\",\"version\":\"1.0\"}",name="vendorParams") | @io.swagger.annotations.ApiModelProperty(value="厂商参数etcp{\"url\":\"http://mapi.test.etcp.cn\",\"appId\":\"FMLK\",\"merchantNo\":\"C7AEAF80BA8C44ADB42F3DB3CBC7D18A\",\"merchantKey\":\"C292FFC7DCFB46AFB02792CD43F6DCC7\",\"version\": \"1.0.0\",\"parkId\":\"Wj7YdvqyiYM=\"},TJD{\"url\":\"http://prep.tingjiandan.com/openapi/gateway\",\"partner\":\"7dbc8ec9037d403b822cb60addfdc681\",\"key\":\"f356cb1bf5a74fb7a564e86128d2c49f\",\"version\":\"1.0\"}",name="vendorParams") | ||||
| private String vendorParams; | private String vendorParams; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getImgUrl() { | |||||
| return imgUrl; | |||||
| } | |||||
| public void setImgUrl(String imgUrl) { | |||||
| this.imgUrl = imgUrl; | |||||
| } | |||||
| public String getAddr() { | |||||
| return addr; | |||||
| } | |||||
| public void setAddr(String _addr) { | |||||
| addr = _addr; | |||||
| } | |||||
| public Integer getNumber() { | |||||
| return number; | |||||
| } | |||||
| public void setNumber(Integer _number) { | |||||
| number = _number; | |||||
| } | |||||
| public Integer getEntryExit() { | |||||
| return entryExit; | |||||
| } | |||||
| public void setEntryExit(Integer _entryExit) { | |||||
| entryExit = _entryExit; | |||||
| } | |||||
| public String getStopFee() { | |||||
| return stopFee; | |||||
| } | |||||
| public void setStopFee(String _stopFee) { | |||||
| this.stopFee = _stopFee; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public String getParkId() { | |||||
| return parkId; | |||||
| } | |||||
| public void setParkId(String _parkId) { | |||||
| parkId = _parkId; | |||||
| } | |||||
| public String getParkingId() { | |||||
| return parkingId; | |||||
| } | |||||
| public void setParkingId(String parkingId) { | |||||
| this.parkingId = parkingId; | |||||
| } | |||||
| public Integer getVendorType() { | |||||
| return vendorType; | |||||
| } | |||||
| public void setVendorType(Integer _vendorType) { | |||||
| vendorType = _vendorType; | |||||
| } | |||||
| public String getVendorParams() { | |||||
| return vendorParams; | |||||
| } | |||||
| public void setVendorParams(String _vendorParams) { | |||||
| vendorParams = _vendorParams; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -7,6 +9,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_pay_account") | @Table(name = "wx_pay_account") | ||||
| @Data | |||||
| public class WxPayAccount implements Serializable { | public class WxPayAccount implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -17,119 +20,26 @@ public class WxPayAccount implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**微信商户号/特约服务商号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信商户号/特约服务商号",name="mchId") | @io.swagger.annotations.ApiModelProperty(value="微信商户号/特约服务商号",name="mchId") | ||||
| private String mchId; | private String mchId; | ||||
| /**微信服务商号*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="subMchId") | @io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="subMchId") | ||||
| private String subMchId; | private String subMchId; | ||||
| /**支付密钥**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付密钥",name="apiKey") | @io.swagger.annotations.ApiModelProperty(value="支付密钥",name="apiKey") | ||||
| private String apiKey; | private String apiKey; | ||||
| /**微信回调,支持3种回调,(1.url/pay 2.url/refund3.url/separate)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信回调,支持3种回调,(1.url/pay 2.url/refund3.url/separate)",name="notifyUrl") | @io.swagger.annotations.ApiModelProperty(value="微信回调,支持3种回调,(1.url/pay 2.url/refund3.url/separate)",name="notifyUrl") | ||||
| private String notifyUrl; | private String notifyUrl; | ||||
| /**证书本地存放位置**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="证书本地存放位置",name="certPath") | @io.swagger.annotations.ApiModelProperty(value="证书本地存放位置",name="certPath") | ||||
| private String certPath; | private String certPath; | ||||
| /**商户模式**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户模式-0:普通商户模式1:服务商模式",name="type") | @io.swagger.annotations.ApiModelProperty(value="商户模式-0:普通商户模式1:服务商模式",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /**是否开启分账**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="0:未开启分账1:开启分账",name="type") | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否开启分账(0:未开启分账1:开启分账)",name="type") | |||||
| private Integer share; | private Integer share; | ||||
| /**手续费**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="手续费",name="rate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="手续费(万分之几,默认60)",name="rate") | |||||
| private Integer rate; | private Integer rate; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public String getMchId() { | |||||
| return mchId; | |||||
| } | |||||
| public void setMchId(String _mchId) { | |||||
| mchId = _mchId; | |||||
| } | |||||
| public String getSubMchId() { | |||||
| return subMchId; | |||||
| } | |||||
| public void setSubMchId(String subMchId) { | |||||
| this.subMchId = subMchId; | |||||
| } | |||||
| public String getApiKey() { | |||||
| return apiKey; | |||||
| } | |||||
| public void setApiKey(String _apiKey) { | |||||
| apiKey = _apiKey; | |||||
| } | |||||
| public String getNotifyUrl() { | |||||
| return notifyUrl; | |||||
| } | |||||
| public void setNotifyUrl(String _notifyUrl) { | |||||
| notifyUrl = _notifyUrl; | |||||
| } | |||||
| public String getCertPath() { | |||||
| return certPath; | |||||
| } | |||||
| public void setCertPath(String _certPath) { | |||||
| certPath = _certPath; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer type) { | |||||
| this.type = type; | |||||
| } | |||||
| public Integer getShare() { | |||||
| return share; | |||||
| } | |||||
| public void setShare(Integer share) { | |||||
| this.share = share; | |||||
| } | |||||
| public Integer getRate() { | |||||
| return rate; | |||||
| } | |||||
| public void setRate(Integer rate) { | |||||
| this.rate = rate; | |||||
| } | |||||
| public String getPayNotifyUrl() { | public String getPayNotifyUrl() { | ||||
| return notifyUrl + "/pay"; | return notifyUrl + "/pay"; | ||||
| } | } | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -10,6 +12,7 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_pay_account_bill") | @Table(name = "wx_pay_account_bill") | ||||
| @Data | |||||
| public class WxPayAccountBill implements Serializable { | public class WxPayAccountBill implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -21,139 +24,31 @@ public class WxPayAccountBill implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**微信商户号/特约服务商号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信商户号/特约服务商号",name="mchId") | @io.swagger.annotations.ApiModelProperty(value="微信商户号/特约服务商号",name="mchId") | ||||
| private String mchId; | private String mchId; | ||||
| /**微信服务商号*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="subMchId") | @io.swagger.annotations.ApiModelProperty(value="微信服务商号",name="subMchId") | ||||
| private String subMchId; | private String subMchId; | ||||
| /**支付密钥**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付密钥",name="apiKey") | @io.swagger.annotations.ApiModelProperty(value="支付密钥",name="apiKey") | ||||
| private String apiKey; | private String apiKey; | ||||
| /**微信回调,支持3种回调,(1.url/pay 2.url/refund3.url/separate)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信回调,支持3种回调,(1.url/pay 2.url/refund3.url/separate)",name="notifyUrl") | @io.swagger.annotations.ApiModelProperty(value="微信回调,支持3种回调,(1.url/pay 2.url/refund3.url/separate)",name="notifyUrl") | ||||
| private String notifyUrl; | private String notifyUrl; | ||||
| /**证书本地存放位置**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="证书本地存放位置",name="certPath") | @io.swagger.annotations.ApiModelProperty(value="证书本地存放位置",name="certPath") | ||||
| private String certPath; | private String certPath; | ||||
| /**商户模式**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户模式-0:普通商户模式1:服务商模式",name="type") | @io.swagger.annotations.ApiModelProperty(value="商户模式-0:普通商户模式1:服务商模式",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /**是否开启分账**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="0:未开启分账1:开启分账",name="type") | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否开启分账(0:未开启分账1:开启分账)",name="type") | |||||
| private boolean share; | private boolean share; | ||||
| /**手续费**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="手续费",name="rate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="手续费(万分之几,默认60)",name="rate") | |||||
| private Integer rate; | private Integer rate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="接收账户名",name="bankAccountName") | @io.swagger.annotations.ApiModelProperty(value="接收账户名",name="bankAccountName") | ||||
| private String bankAccountName; | private String bankAccountName; | ||||
| /**证书本地存放位置**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="接收银行卡号",name="bankCardId") | @io.swagger.annotations.ApiModelProperty(value="接收银行卡号",name="bankCardId") | ||||
| private String bankCardId; | private String bankCardId; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public String getMchId() { | |||||
| return mchId; | |||||
| } | |||||
| public void setMchId(String _mchId) { | |||||
| mchId = _mchId; | |||||
| } | |||||
| public String getSubMchId() { | |||||
| return subMchId; | |||||
| } | |||||
| public void setSubMchId(String subMchId) { | |||||
| this.subMchId = subMchId; | |||||
| } | |||||
| public String getApiKey() { | |||||
| return apiKey; | |||||
| } | |||||
| public void setApiKey(String _apiKey) { | |||||
| apiKey = _apiKey; | |||||
| } | |||||
| public String getNotifyUrl() { | |||||
| return notifyUrl; | |||||
| } | |||||
| public void setNotifyUrl(String _notifyUrl) { | |||||
| notifyUrl = _notifyUrl; | |||||
| } | |||||
| public String getCertPath() { | |||||
| return certPath; | |||||
| } | |||||
| public void setCertPath(String _certPath) { | |||||
| certPath = _certPath; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer type) { | |||||
| this.type = type; | |||||
| } | |||||
| public boolean isShare() { | |||||
| return share; | |||||
| } | |||||
| public void setShare(boolean share) { | |||||
| this.share = share; | |||||
| } | |||||
| public Integer getRate() { | |||||
| return rate; | |||||
| } | |||||
| public void setRate(Integer rate) { | |||||
| this.rate = rate; | |||||
| } | |||||
| public String getBankAccountName() { | |||||
| return bankAccountName; | |||||
| } | |||||
| public void setBankAccountName(String bankAccountName) { | |||||
| this.bankAccountName = bankAccountName; | |||||
| } | |||||
| public String getBankCardId() { | |||||
| return bankCardId; | |||||
| } | |||||
| public void setBankCardId(String bankCardId) { | |||||
| this.bankCardId = bankCardId; | |||||
| } | |||||
| public String getPayNotifyUrl() { | public String getPayNotifyUrl() { | ||||
| return notifyUrl + "/pay"; | return notifyUrl + "/pay"; | ||||
| } | } | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -12,6 +14,7 @@ import java.util.List; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_pay_bill") | @Table(name = "wx_pay_bill") | ||||
| @Data | |||||
| public class WxPayBill implements Serializable { | public class WxPayBill implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -23,27 +26,6 @@ public class WxPayBill implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | /**租户ID**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_pay_order") | @Table(name = "wx_pay_order") | ||||
| @Data | |||||
| public class WxPayOrder implements Serializable { | public class WxPayOrder implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,224 +21,47 @@ public class WxPayOrder implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| /**更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| /**订单ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") | @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") | ||||
| private Long orderId; | private Long orderId; | ||||
| /**用户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") | ||||
| private Long cUserId; | private Long cUserId; | ||||
| /**B端用户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="B端用户ID",name="bUserId") | @io.swagger.annotations.ApiModelProperty(value="B端用户ID",name="bUserId") | ||||
| private Long bUserId; | private Long bUserId; | ||||
| /**扫码授权编码**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="扫码授权编码",name="authCode") | @io.swagger.annotations.ApiModelProperty(value="扫码授权编码",name="authCode") | ||||
| private String authCode; | private String authCode; | ||||
| /**ip地址**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") | @io.swagger.annotations.ApiModelProperty(value="ip地址",name="ip") | ||||
| private String ip; | private String ip; | ||||
| /**支付金额(分)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") | @io.swagger.annotations.ApiModelProperty(value="支付金额(分)",name="payAmount") | ||||
| private Integer payAmount; | private Integer payAmount; | ||||
| /**支付发起时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") | @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") | ||||
| private Date payTimeStart; | private Date payTimeStart; | ||||
| /**支付结束时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") | @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") | ||||
| private Date payTimeEnd; | private Date payTimeEnd; | ||||
| /**微信预支付交易会话标识**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信预支付交易会话标识",name="prepayId") | @io.swagger.annotations.ApiModelProperty(value="微信预支付交易会话标识",name="prepayId") | ||||
| private String prepayId; | private String prepayId; | ||||
| /**微信生成的订单号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") | @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") | ||||
| private String transactionId; | private String transactionId; | ||||
| /**支付渠道: 0-微信 1-支付宝 2-银联 **/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor") | @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="payVendor") | ||||
| private Integer payVendor; | private Integer payVendor; | ||||
| /**支付订单号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") | @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") | ||||
| private String payOrderNo; | private String payOrderNo; | ||||
| /**支付状态: 0-支付中;1-支付成功;2-支付失败**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus") | @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="payOrderStatus") | ||||
| private Integer payOrderStatus; | private Integer payOrderStatus; | ||||
| /**分账状态: 0-未分账;1-分账**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账状态: 0-未分账;1-分账",name="payOrderStatus") | @io.swagger.annotations.ApiModelProperty(value="分账状态: 0-未分账;1-分账",name="payOrderStatus") | ||||
| private Integer share; | private Integer share; | ||||
| /**分账金额(总金额扣除手续费后的金额)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账金额",name="shareAmount") | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账金额(总金额扣除手续费后的金额)",name="shareAmount") | |||||
| private Integer shareAmount; | private Integer shareAmount; | ||||
| /**支付失败原因**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") | @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") | ||||
| private String failReason; | private String failReason; | ||||
| @io.swagger.annotations.ApiModelProperty(value="支付后结果来源(0:callback, 1:query)",name="payEndFrom") | @io.swagger.annotations.ApiModelProperty(value="支付后结果来源(0:callback, 1:query)",name="payEndFrom") | ||||
| private Integer payEndFrom; | private Integer payEndFrom; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Date getCreateTime() { | |||||
| return createTime; | |||||
| } | |||||
| public void setCreateTime(Date _createTime) { | |||||
| createTime = _createTime; | |||||
| } | |||||
| public Date getUpdateTime() { | |||||
| return updateTime; | |||||
| } | |||||
| public void setUpdateTime(Date _updateTime) { | |||||
| updateTime = _updateTime; | |||||
| } | |||||
| public Long getOrderId() { | |||||
| return orderId; | |||||
| } | |||||
| public void setOrderId(Long _orderId) { | |||||
| orderId = _orderId; | |||||
| } | |||||
| public Long getcUserId() { | |||||
| return cUserId; | |||||
| } | |||||
| public void setcUserId(Long cUserId) { | |||||
| this.cUserId = cUserId; | |||||
| } | |||||
| public Long getbUserId() { | |||||
| return bUserId; | |||||
| } | |||||
| public void setbUserId(Long bUserId) { | |||||
| this.bUserId = bUserId; | |||||
| } | |||||
| public String getAuthCode() { | |||||
| return authCode; | |||||
| } | |||||
| public void setAuthCode(String authCode) { | |||||
| this.authCode = authCode; | |||||
| } | |||||
| public String getIp() { | |||||
| return ip; | |||||
| } | |||||
| public void setIp(String _ip) { | |||||
| ip = _ip; | |||||
| } | |||||
| public Integer getPayAmount() { | |||||
| return payAmount; | |||||
| } | |||||
| public void setPayAmount(Integer _payAmount) { | |||||
| payAmount = _payAmount; | |||||
| } | |||||
| public Date getPayTimeStart() { | |||||
| return payTimeStart; | |||||
| } | |||||
| public void setPayTimeStart(Date _payTimeStart) { | |||||
| payTimeStart = _payTimeStart; | |||||
| } | |||||
| public Date getPayTimeEnd() { | |||||
| return payTimeEnd; | |||||
| } | |||||
| public void setPayTimeEnd(Date _payTimeEnd) { | |||||
| payTimeEnd = _payTimeEnd; | |||||
| } | |||||
| public String getPrepayId() { | |||||
| return prepayId; | |||||
| } | |||||
| public void setPrepayId(String prepayId) { | |||||
| this.prepayId = prepayId; | |||||
| } | |||||
| public String getTransactionId() { | |||||
| return transactionId; | |||||
| } | |||||
| public void setTransactionId(String _transactionId) { | |||||
| transactionId = _transactionId; | |||||
| } | |||||
| public Integer getPayVendor() { | |||||
| return payVendor; | |||||
| } | |||||
| public void setPayVendor(Integer _payVendor) { | |||||
| payVendor = _payVendor; | |||||
| } | |||||
| public String getPayOrderNo() { | |||||
| return payOrderNo; | |||||
| } | |||||
| public void setPayOrderNo(String _payOrderNo) { | |||||
| payOrderNo = _payOrderNo; | |||||
| } | |||||
| public Integer getPayOrderStatus() { | |||||
| return payOrderStatus; | |||||
| } | |||||
| public void setPayOrderStatus(Integer _payOrderStatus) { | |||||
| payOrderStatus = _payOrderStatus; | |||||
| } | |||||
| public Integer getShare() { | |||||
| return share; | |||||
| } | |||||
| public void setShare(Integer share) { | |||||
| this.share = share; | |||||
| } | |||||
| public Integer getShareAmount() { | |||||
| return shareAmount; | |||||
| } | |||||
| public void setShareAmount(Integer shareAmount) { | |||||
| this.shareAmount = shareAmount; | |||||
| } | |||||
| public String getFailReason() { | |||||
| return failReason; | |||||
| } | |||||
| public void setFailReason(String _failReason) { | |||||
| failReason = _failReason; | |||||
| } | |||||
| public Integer getPayEndFrom() { | |||||
| return payEndFrom; | |||||
| } | |||||
| public void setPayEndFrom(Integer payEndFrom) { | |||||
| this.payEndFrom = payEndFrom; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_profit_sharing_order") | @Table(name = "wx_profit_sharing_order") | ||||
| @Data | |||||
| public class WxProfitSharingOrder implements Serializable { | public class WxProfitSharingOrder implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,162 +21,36 @@ public class WxProfitSharingOrder implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*接收方(商场租户id)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*商户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*订单ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") | @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") | ||||
| private Long orderId; | private Long orderId; | ||||
| /*分账总金额(分)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账总金额(分)",name="payAmount") | @io.swagger.annotations.ApiModelProperty(value="分账总金额(分)",name="payAmount") | ||||
| private Integer payAmount; | private Integer payAmount; | ||||
| /*分账结束时间(秒)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账结束时间(秒)",name="payTimeEnd") | @io.swagger.annotations.ApiModelProperty(value="分账结束时间(秒)",name="payTimeEnd") | ||||
| private Date payTimeEnd; | private Date payTimeEnd; | ||||
| /*分账发起时间(秒)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账发起时间(秒)",name="payTimeStart") | @io.swagger.annotations.ApiModelProperty(value="分账发起时间(秒)",name="payTimeStart") | ||||
| private Date payTimeStart; | private Date payTimeStart; | ||||
| /*微信生成的支付单号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信生成的支付单号",name="transactionId") | @io.swagger.annotations.ApiModelProperty(value="微信生成的支付单号",name="transactionId") | ||||
| private String transactionId; | private String transactionId; | ||||
| /*微信生成分账单号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信生成分账单号",name="sharingOrderId") | @io.swagger.annotations.ApiModelProperty(value="微信生成分账单号",name="sharingOrderId") | ||||
| private String sharingOrderNo; | private String sharingOrderNo; | ||||
| /*分账类型,0单次,1多次,2完结**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账类型",name="type") | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账类型(0单次,1多次,2完结)",name="type") | |||||
| private Integer type; | private Integer type; | ||||
| /*分账接收者参数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账接收者参数",name="receivers") | @io.swagger.annotations.ApiModelProperty(value="分账接收者参数",name="receivers") | ||||
| private String receivers; | private String receivers; | ||||
| /*分账申请失败原因**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账申请失败原因",name="errorMsg") | @io.swagger.annotations.ApiModelProperty(value="分账申请失败原因",name="errorMsg") | ||||
| private String errorMsg; | private String errorMsg; | ||||
| /*分账状态:1=提交订单失败, 2=提交业务失败,3=受理成功,4=处理中,5=处理完成,6=处理失败, 已关单,(1-2)为API返回,2具体信息在error_des中,(2-6)为查询返回**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账状态:1=提交订单失败, 2=提交业务失败,3=受理成功,4=处理中,5=处理完成,6=处理失败, 已关单,(1-2)为API返回,2具体信息在error_des中,(2-6)为查询返回",name="sharingStatus") | @io.swagger.annotations.ApiModelProperty(value="分账状态:1=提交订单失败, 2=提交业务失败,3=受理成功,4=处理中,5=处理完成,6=处理失败, 已关单,(1-2)为API返回,2具体信息在error_des中,(2-6)为查询返回",name="sharingStatus") | ||||
| private Integer sharingStatus; | private Integer sharingStatus; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Long getOrderId() { | |||||
| return orderId; | |||||
| } | |||||
| public void setOrderId(Long _orderId) { | |||||
| orderId = _orderId; | |||||
| } | |||||
| public Integer getPayAmount() { | |||||
| return payAmount; | |||||
| } | |||||
| public void setPayAmount(Integer _payAmount) { | |||||
| payAmount = _payAmount; | |||||
| } | |||||
| public Date getPayTimeEnd() { | |||||
| return payTimeEnd; | |||||
| } | |||||
| public void setPayTimeEnd(Date _payTimeEnd) { | |||||
| payTimeEnd = _payTimeEnd; | |||||
| } | |||||
| public Date getPayTimeStart() { | |||||
| return payTimeStart; | |||||
| } | |||||
| public void setPayTimeStart(Date _payTimeStart) { | |||||
| payTimeStart = _payTimeStart; | |||||
| } | |||||
| public String getTransaction() { | |||||
| return transactionId; | |||||
| } | |||||
| public void setTransactionId(String _transactionId) { | |||||
| transactionId = _transactionId; | |||||
| } | |||||
| public String getSharingOrderNo() { | |||||
| return sharingOrderNo; | |||||
| } | |||||
| public void setSharingOrderNo(String _sharingOrderNo) { | |||||
| sharingOrderNo = _sharingOrderNo; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer type) { | |||||
| this.type = type; | |||||
| } | |||||
| public String getReceivers() { | |||||
| return receivers; | |||||
| } | |||||
| public void setReceivers(String receivers) { | |||||
| this.receivers = receivers; | |||||
| } | |||||
| public String getErrorMsg() { | |||||
| return errorMsg; | |||||
| } | |||||
| public void setErrorMsg(String _errorMsg) { | |||||
| errorMsg = _errorMsg; | |||||
| } | |||||
| public Integer getSharingStatus() { | |||||
| return sharingStatus; | |||||
| } | |||||
| public void setSharingStatus(Integer _sharingStatus) { | |||||
| sharingStatus = _sharingStatus; | |||||
| } | |||||
| public Date getUpdateTime() { | |||||
| return updateTime; | |||||
| } | |||||
| public void setUpdateTime(Date _updateTime) { | |||||
| updateTime = _updateTime; | |||||
| } | |||||
| public Date getCreateTime() { | |||||
| return createTime; | |||||
| } | |||||
| public void setCreateTime(Date _createTime) { | |||||
| createTime = _createTime; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_profit_sharing_receiver") | @Table(name = "wx_profit_sharing_receiver") | ||||
| @Data | |||||
| public class WxProfitSharingReceiver implements Serializable { | public class WxProfitSharingReceiver implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,176 +21,42 @@ public class WxProfitSharingReceiver implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*接收方(商场租户id)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*商户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*分账接收方类型,1 = MERCHANT_ID(商户 ID) 2 = PERSONAL_WECHATID(个人微信号) 3 = PERSONAL_OPENID(个人openid(由父商 户 APPID 转换得到) 4 = PERSONAL_SUB_OPENID(个人 sub_openid(由子商户 APPID 转换得到))**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账接收方类型,1 = MERCHANT_ID(商户 ID) 2 = PERSONAL_WECHATID(个人微信号) 3 = PERSONAL_OPENID(个人openid(由父商 户 APPID 转换得到) 4 = PERSONAL_SUB_OPENID(个人 sub_openid(由子商户 APPID 转换得到))",name="receiverType") | @io.swagger.annotations.ApiModelProperty(value="分账接收方类型,1 = MERCHANT_ID(商户 ID) 2 = PERSONAL_WECHATID(个人微信号) 3 = PERSONAL_OPENID(个人openid(由父商 户 APPID 转换得到) 4 = PERSONAL_SUB_OPENID(个人 sub_openid(由子商户 APPID 转换得到))",name="receiverType") | ||||
| private Integer receiverType; | private Integer receiverType; | ||||
| /*分账接收方账号,见接收方类型**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账接收方账号,见接收方类型",name="receiverAccount") | @io.swagger.annotations.ApiModelProperty(value="分账接收方账号,见接收方类型",name="receiverAccount") | ||||
| private String receiverAccount; | private String receiverAccount; | ||||
| /*分款接受方说明**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分款接受方说明",name="receiverComments") | @io.swagger.annotations.ApiModelProperty(value="分款接受方说明",name="receiverComments") | ||||
| private String receiverComments; | private String receiverComments; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| /*分账类型:1-服务商户分账,2-商户转入银行卡**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账类型:1-服务商户分账,2-商户转入银行卡",name="sharingType") | @io.swagger.annotations.ApiModelProperty(value="分账类型:1-服务商户分账,2-商户转入银行卡",name="sharingType") | ||||
| private Integer sharingType; | private Integer sharingType; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="bankNo") | @io.swagger.annotations.ApiModelProperty(value="",name="bankNo") | ||||
| private String bankNo; | private String bankNo; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="trueName") | @io.swagger.annotations.ApiModelProperty(value="",name="trueName") | ||||
| private String trueName; | private String trueName; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="bankCode") | @io.swagger.annotations.ApiModelProperty(value="",name="bankCode") | ||||
| private String bankCode; | private String bankCode; | ||||
| /*分账接收方状态 0,正常 1,停用**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账接收方状态 0,正常 1,停用",name="status") | @io.swagger.annotations.ApiModelProperty(value="分账接收方状态 0,正常 1,停用",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| /*分账参数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账参数,目前为分账比例(单位为万分之一)",name="parameter") | @io.swagger.annotations.ApiModelProperty(value="分账参数,目前为分账比例(单位为万分之一)",name="parameter") | ||||
| private String parameter; | private String parameter; | ||||
| /*分账金额**/ | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="分账金额(分)",name="sharingAmount") | |||||
| private Integer sharingAmount; | private Integer sharingAmount; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "是否使用 0,不使用 1,使用", name = "isUse") | @io.swagger.annotations.ApiModelProperty(value = "是否使用 0,不使用 1,使用", name = "isUse") | ||||
| private Integer isUse; | private Integer isUse; | ||||
| public Integer getIsUse() { | |||||
| return isUse; | |||||
| } | |||||
| public void setIsUse(Integer isUse) { | |||||
| this.isUse = isUse; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer status) { | |||||
| this.status = status; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Integer getReceiverType() { | |||||
| return receiverType; | |||||
| } | |||||
| public void setReceiverType(Integer _receiverType) { | |||||
| receiverType = _receiverType; | |||||
| } | |||||
| public String getReceiverAccount() { | |||||
| return receiverAccount; | |||||
| } | |||||
| public void setReceiverAccount(String _receiverAccount) { | |||||
| receiverAccount = _receiverAccount; | |||||
| } | |||||
| public String getReceiverComments() { | |||||
| return receiverComments; | |||||
| } | |||||
| public void setReceiverComments(String _receiverComments) { | |||||
| receiverComments = _receiverComments; | |||||
| } | |||||
| public Date getCreateTime() { | |||||
| return createTime; | |||||
| } | |||||
| public void setCreateTime(Date _createTime) { | |||||
| createTime = _createTime; | |||||
| } | |||||
| public Date getUpdateTime() { | |||||
| return updateTime; | |||||
| } | |||||
| public void setUpdateTime(Date _updateTime) { | |||||
| updateTime = _updateTime; | |||||
| } | |||||
| public Integer getSharingType() { | |||||
| return sharingType; | |||||
| } | |||||
| public void setSharingType(Integer _sharingType) { | |||||
| sharingType = _sharingType; | |||||
| } | |||||
| public String getBankNo() { | |||||
| return bankNo; | |||||
| } | |||||
| public void setBankNo(String _bankNo) { | |||||
| bankNo = _bankNo; | |||||
| } | |||||
| public String getTrueName() { | |||||
| return trueName; | |||||
| } | |||||
| public void setTrueName(String _trueName) { | |||||
| trueName = _trueName; | |||||
| } | |||||
| public String getBankCode() { | |||||
| return bankCode; | |||||
| } | |||||
| public void setBankCode(String _bankCode) { | |||||
| bankCode = _bankCode; | |||||
| } | |||||
| public String getParameter() { | |||||
| return parameter; | |||||
| } | |||||
| public void setParameter(String parameter) { | |||||
| this.parameter = parameter; | |||||
| } | |||||
| public Integer getSharingAmount() { | |||||
| return sharingAmount; | |||||
| } | |||||
| public void setSharingAmount(Integer sharingAmount) { | |||||
| this.sharingAmount = sharingAmount; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_profit_sharing_result") | @Table(name = "wx_profit_sharing_result") | ||||
| @Data | |||||
| public class WxProfitSharingResult implements Serializable { | public class WxProfitSharingResult implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,137 +21,31 @@ public class WxProfitSharingResult implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*接收方(商场租户id)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="接收方(商场租户id)",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*商户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*分账订单号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账订单号",name="sharingOrderId") | @io.swagger.annotations.ApiModelProperty(value="分账订单号",name="sharingOrderId") | ||||
| private Long sharingOrderId; | private Long sharingOrderId; | ||||
| /*分账接收方id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账接收方id",name="sharingReceiverId") | @io.swagger.annotations.ApiModelProperty(value="分账接收方id",name="sharingReceiverId") | ||||
| private Long sharingReceiverId; | private Long sharingReceiverId; | ||||
| /*分账金额(分)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账金额(分)",name="payAmount") | @io.swagger.annotations.ApiModelProperty(value="分账金额(分)",name="payAmount") | ||||
| private Integer payAmount; | private Integer payAmount; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| /*分账结果状态:1-PENDING:待分账 2-SUCCESS:分账成功 3-ADJUST:分账失败待调账 4-RETURNED:已转回分账方 5-CLOSED: 已关闭 **/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="分账结果状态:1-PENDING:待分账 2-SUCCESS:分账成功 3-ADJUST:分账失败待调账 4-RETURNED:已转回分账方 5-CLOSED: 已关闭 ",name="sharingStatus") | @io.swagger.annotations.ApiModelProperty(value="分账结果状态:1-PENDING:待分账 2-SUCCESS:分账成功 3-ADJUST:分账失败待调账 4-RETURNED:已转回分账方 5-CLOSED: 已关闭 ",name="sharingStatus") | ||||
| private Integer sharingStatus; | private Integer sharingStatus; | ||||
| /*微信返回的分账完成时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信返回的分账完成时间",name="finishTime") | @io.swagger.annotations.ApiModelProperty(value="微信返回的分账完成时间",name="finishTime") | ||||
| private String finishTime; | private String finishTime; | ||||
| /*微信返回的失败原因**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信返回的失败原因",name="failedReason") | @io.swagger.annotations.ApiModelProperty(value="微信返回的失败原因",name="failedReason") | ||||
| private String failedReason; | private String failedReason; | ||||
| /*描述**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="描述",name="description") | @io.swagger.annotations.ApiModelProperty(value="描述",name="description") | ||||
| private String description; | private String description; | ||||
| public Long getSharingOrderId() { | |||||
| return sharingOrderId; | |||||
| } | |||||
| public void setSharingOrderId(Long _sharingOrderId) { | |||||
| sharingOrderId = _sharingOrderId; | |||||
| } | |||||
| public Long getSharingReceiverId() { | |||||
| return sharingReceiverId; | |||||
| } | |||||
| public void setSharingReceiverId(Long _sharingReceiverId) { | |||||
| sharingReceiverId = _sharingReceiverId; | |||||
| } | |||||
| public Integer getPayAmount() { | |||||
| return payAmount; | |||||
| } | |||||
| public void setPayAmount(Integer _payAmount) { | |||||
| payAmount = _payAmount; | |||||
| } | |||||
| public Date getUpdateTime() { | |||||
| return updateTime; | |||||
| } | |||||
| public void setUpdateTime(Date _updateTime) { | |||||
| updateTime = _updateTime; | |||||
| } | |||||
| public Date getCreateTime() { | |||||
| return createTime; | |||||
| } | |||||
| public void setCreateTime(Date _createTime) { | |||||
| createTime = _createTime; | |||||
| } | |||||
| public Integer getSharingStatus() { | |||||
| return sharingStatus; | |||||
| } | |||||
| public void setSharingStatus(Integer _sharingStatus) { | |||||
| sharingStatus = _sharingStatus; | |||||
| } | |||||
| public String getFinishTime() { | |||||
| return finishTime; | |||||
| } | |||||
| public void setFinishTime(String _finishTime) { | |||||
| finishTime = _finishTime; | |||||
| } | |||||
| public String getFailedReason() { | |||||
| return failedReason; | |||||
| } | |||||
| public void setFailedReason(String _failedReason) { | |||||
| failedReason = _failedReason; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long merchantId) { | |||||
| this.merchantId = merchantId; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public String getDescription() { | |||||
| return description; | |||||
| } | |||||
| public void setDescription(String description) { | |||||
| this.description = description; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,6 +1,9 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.iformall.common.SortColumn; | import com.iformall.common.SortColumn; | ||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import lombok.ToString; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| @@ -14,14 +17,17 @@ import java.util.Map; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_property_contract") | @Table(name = "wx_property_contract") | ||||
| @Data | |||||
| @ToString(callSuper = true) | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxPropertyContract extends BaseEntity { | public class WxPropertyContract extends BaseEntity { | ||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| // 审核状态,0未审核 1审核中 2审核完成 3驳回 4合同作废 | |||||
| @io.swagger.annotations.ApiModelProperty(value="审核状态,0未审核 1审核中 2审核完成 3驳回 4合同作废",name="applyStatus") | |||||
| private Integer applyStatus; | private Integer applyStatus; | ||||
| // 审批流1合同2账单3终止审批 | |||||
| @io.swagger.annotations.ApiModelProperty(value="审批流1合同2账单3终止审批",name="businessType") | |||||
| private Integer businessType; | private Integer businessType; | ||||
| @Transient | @Transient | ||||
| @@ -33,122 +39,93 @@ public class WxPropertyContract extends BaseEntity { | |||||
| super.setSortColumns(this.sortColumns); | super.setSortColumns(this.sortColumns); | ||||
| return super.getSortColumns(); | return super.getSortColumns(); | ||||
| } | } | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @Transient | @Transient | ||||
| @SortColumn(column = "shopNumber") | @SortColumn(column = "shopNumber") | ||||
| private String shopNumber; | private String shopNumber; | ||||
| public String getShopNumber() { | |||||
| return shopNumber; | |||||
| } | |||||
| public void setShopNumber(String shopNumber) { | |||||
| this.shopNumber = shopNumber; | |||||
| } | |||||
| @Transient | @Transient | ||||
| private String brandName; | private String brandName; | ||||
| public String getBrandName() { | |||||
| return brandName; | |||||
| } | |||||
| public void setBrandName(String brandName) { | |||||
| this.brandName = brandName; | |||||
| } | |||||
| /*商户**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId") | @io.swagger.annotations.ApiModelProperty(value="商户",name="merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*月租金/分成(分)**/ | /*月租金/分成(分)**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price") | @io.swagger.annotations.ApiModelProperty(value="物业费(分)",name="price") | ||||
| private Long price; | private Long price; | ||||
| /*计租开始时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="计租开始时间",name="rentalStartDate") | @io.swagger.annotations.ApiModelProperty(value="计租开始时间",name="rentalStartDate") | ||||
| private Date rentalStartDate; | private Date rentalStartDate; | ||||
| /*计租结束时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="计租结束时间",name="rentalEndDate") | @io.swagger.annotations.ApiModelProperty(value="计租结束时间",name="rentalEndDate") | ||||
| private Date rentalEndDate; | private Date rentalEndDate; | ||||
| /*签定合同时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="签定合同时间",name="signDate") | @io.swagger.annotations.ApiModelProperty(value="签定合同时间",name="signDate") | ||||
| private Date signDate; | private Date signDate; | ||||
| /*付款周期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="付款周期",name="receivePeriod") | @io.swagger.annotations.ApiModelProperty(value="付款周期",name="receivePeriod") | ||||
| private Integer receivePeriod; | private Integer receivePeriod; | ||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*合同文件路径**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="合同文件路径",name="filepath") | @io.swagger.annotations.ApiModelProperty(value="合同文件路径",name="filepath") | ||||
| private String filepath; | private String filepath; | ||||
| /*合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期",name="status") | @io.swagger.annotations.ApiModelProperty(value="合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| /*合同编号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="合同编号",name="contractNumber") | @io.swagger.annotations.ApiModelProperty(value="合同编号",name="contractNumber") | ||||
| private String contractNumber; | private String contractNumber; | ||||
| /*押金**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="押金",name="deposit") | @io.swagger.annotations.ApiModelProperty(value="押金",name="deposit") | ||||
| private Long deposit; | private Long deposit; | ||||
| /*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="交租日 计租开始时间减去交租日的天数为基数 提前多少日交租",name="payDate") | @io.swagger.annotations.ApiModelProperty(value="交租日 计租开始时间减去交租日的天数为基数 提前多少日交租",name="payDate") | ||||
| private Integer payDate; | private Integer payDate; | ||||
| /*是否删除1是0否**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="是否删除1是0否",name="isDel") | @io.swagger.annotations.ApiModelProperty(value="是否删除1是0否",name="isDel") | ||||
| private Integer isDel; | private Integer isDel; | ||||
| /*商户名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName") | @io.swagger.annotations.ApiModelProperty(value="商户名称",name="merchantName") | ||||
| private String merchantName; | private String merchantName; | ||||
| /*经营品牌**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="经营品牌",name="brand") | @io.swagger.annotations.ApiModelProperty(value="经营品牌",name="brand") | ||||
| private Long brand; | private Long brand; | ||||
| /*经营业态ID:参照wx_business表**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") | @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") | ||||
| private Integer businessId; | private Integer businessId; | ||||
| /*店铺类型:1直营店2加盟店3个体店4旗舰店**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="店铺类型:1直营店2加盟店3个体店4旗舰店",name="shopType") | @io.swagger.annotations.ApiModelProperty(value="店铺类型:1直营店2加盟店3个体店4旗舰店",name="shopType") | ||||
| private Integer shopType; | private Integer shopType; | ||||
| /*商铺ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") | ||||
| private Long shopId; | private Long shopId; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updatetime") | ||||
| private Date updatetime; | private Date updatetime; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| /*计租面积**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="计租面积",name="rentArea") | @io.swagger.annotations.ApiModelProperty(value="计租面积",name="rentArea") | ||||
| private String rentArea; | private String rentArea; | ||||
| /*联系人**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkPerson") | @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkPerson") | ||||
| private String linkPerson; | private String linkPerson; | ||||
| /*联系电话**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="联系电话",name="linkPhone") | @io.swagger.annotations.ApiModelProperty(value="联系电话",name="linkPhone") | ||||
| private String linkPhone; | private String linkPhone; | ||||
| /*支付账号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付账号",name="payAccount") | @io.swagger.annotations.ApiModelProperty(value="支付账号",name="payAccount") | ||||
| private String payAccount; | private String payAccount; | ||||
| /*上传文件名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="上传文件名",name="filename") | @io.swagger.annotations.ApiModelProperty(value="上传文件名",name="filename") | ||||
| private String filename; | private String filename; | ||||
| /*租期:月**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租期:月",name="lease") | @io.swagger.annotations.ApiModelProperty(value="租期:月",name="lease") | ||||
| private Integer lease; | private Integer lease; | ||||
| /*租金合同ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") | @io.swagger.annotations.ApiModelProperty(value="租金合同ID",name="rentContractId") | ||||
| private Long rentContractId; | private Long rentContractId; | ||||
| @@ -172,7 +149,6 @@ public class WxPropertyContract extends BaseEntity { | |||||
| private String adjustRatio; | private String adjustRatio; | ||||
| // 物业预账单列表 | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value = "物业预账单列表", name = "previewBillRentList") | @io.swagger.annotations.ApiModelProperty(value = "物业预账单列表", name = "previewBillRentList") | ||||
| private List<WxBillProperty> previewBillRentList; | private List<WxBillProperty> previewBillRentList; | ||||
| @@ -189,308 +165,36 @@ public class WxPropertyContract extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private String floor; | private String floor; | ||||
| public String getBuilding() { | |||||
| return building; | |||||
| } | |||||
| public void setBuilding(String building) { | |||||
| this.building = building; | |||||
| } | |||||
| public String getFloor() { | |||||
| return floor; | |||||
| } | |||||
| public void setFloor(String floor) { | |||||
| this.floor = floor; | |||||
| } | |||||
| public String getFileNames() { | |||||
| return fileNames; | |||||
| } | |||||
| public void setFileNames(String fileNames) { | |||||
| this.fileNames = fileNames; | |||||
| } | |||||
| public String getRentInfo() { | |||||
| return rentInfo; | |||||
| } | |||||
| public void setRentInfo(String rentInfo) { | |||||
| this.rentInfo = rentInfo; | |||||
| } | |||||
| public String getAdjustRatio() { | |||||
| return adjustRatio; | |||||
| } | |||||
| public void setAdjustRatio(String adjustRatio) { | |||||
| this.adjustRatio = adjustRatio; | |||||
| } | |||||
| public List<WxBillProperty> getPreviewBillRentList() { | |||||
| return previewBillRentList; | |||||
| } | |||||
| public void setPreviewBillRentList(List<WxBillProperty> previewBillRentList) { | |||||
| this.previewBillRentList = previewBillRentList; | |||||
| } | |||||
| public Integer getBusinessType() { | |||||
| return businessType; | |||||
| } | |||||
| public void setBusinessType(Integer businessType) { | |||||
| this.businessType = businessType; | |||||
| } | |||||
| public Map<String, Object> getFlowParams() { | |||||
| return flowParams; | |||||
| } | |||||
| public void setFlowParams(Map<String, Object> flowParams) { | |||||
| this.flowParams = flowParams; | |||||
| } | |||||
| public Integer getApplyStatus() { | |||||
| return applyStatus; | |||||
| } | |||||
| public void setApplyStatus(Integer applyStatus) { | |||||
| this.applyStatus = applyStatus; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Long getPrice() { | |||||
| return price; | |||||
| } | |||||
| public void setPrice(Long _price) { | |||||
| price = _price; | |||||
| } | |||||
| public Date getRentalStartDate() { | |||||
| return rentalStartDate; | |||||
| } | |||||
| public void setRentalStartDate(Date _rentalStartDate) { | |||||
| rentalStartDate = _rentalStartDate; | |||||
| } | |||||
| public Date getRentalEndDate() { | |||||
| return rentalEndDate; | |||||
| } | |||||
| public void setRentalEndDate(Date _rentalEndDate) { | |||||
| rentalEndDate = _rentalEndDate; | |||||
| } | |||||
| public Date getSignDate() { | |||||
| return signDate; | |||||
| } | |||||
| public void setSignDate(Date _signDate) { | |||||
| signDate = _signDate; | |||||
| } | |||||
| public Integer getReceivePeriod() { | |||||
| return receivePeriod; | |||||
| } | |||||
| public void setReceivePeriod(Integer _receivePeriod) { | |||||
| receivePeriod = _receivePeriod; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getFilepath() { | |||||
| return filepath; | |||||
| } | |||||
| public void setFilepath(String _filepath) { | |||||
| filepath = _filepath; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer _status) { | |||||
| status = _status; | |||||
| } | |||||
| public String getContractNumber() { | |||||
| return contractNumber; | |||||
| } | |||||
| public void setContractNumber(String _contractNumber) { | |||||
| contractNumber = _contractNumber; | |||||
| } | |||||
| public Long getDeposit() { | |||||
| return deposit; | |||||
| } | |||||
| public void setDeposit(Long _deposit) { | |||||
| deposit = _deposit; | |||||
| } | |||||
| public Integer getPayDate() { | |||||
| return payDate; | |||||
| } | |||||
| public void setPayDate(Integer _payDate) { | |||||
| payDate = _payDate; | |||||
| } | |||||
| public Integer getIsDel() { | |||||
| return isDel; | |||||
| } | |||||
| public void setIsDel(Integer _isDel) { | |||||
| isDel = _isDel; | |||||
| } | |||||
| public String getMerchantName() { | |||||
| return merchantName; | |||||
| } | |||||
| public void setMerchantName(String _merchantName) { | |||||
| merchantName = _merchantName; | |||||
| } | |||||
| public Long getBrand() { | |||||
| return brand; | |||||
| } | |||||
| public void setBrand(Long _brand) { | |||||
| brand = _brand; | |||||
| } | |||||
| public Integer getBusinessId() { | |||||
| return businessId; | |||||
| } | |||||
| public void setBusinessId(Integer _businessId) { | |||||
| businessId = _businessId; | |||||
| } | |||||
| public Integer getShopType() { | |||||
| return shopType; | |||||
| } | |||||
| public void setShopType(Integer _shopType) { | |||||
| shopType = _shopType; | |||||
| } | |||||
| public Long getShopId() { | |||||
| return shopId; | |||||
| } | |||||
| public void setShopId(Long _shopId) { | |||||
| shopId = _shopId; | |||||
| } | |||||
| public Date getUpdatetime() { | |||||
| return updatetime; | |||||
| } | |||||
| public void setUpdatetime(Date _updatetime) { | |||||
| updatetime = _updatetime; | |||||
| } | |||||
| public Date getCreatetime() { | |||||
| return createtime; | |||||
| } | |||||
| public void setCreatetime(Date _createtime) { | |||||
| createtime = _createtime; | |||||
| } | |||||
| public String getRentArea() { | |||||
| return rentArea; | |||||
| } | |||||
| public void setRentArea(String _rentArea) { | |||||
| rentArea = _rentArea; | |||||
| } | |||||
| public String getLinkPerson() { | |||||
| return linkPerson; | |||||
| } | |||||
| public void setLinkPerson(String _linkPerson) { | |||||
| linkPerson = _linkPerson; | |||||
| } | |||||
| public String getLinkPhone() { | |||||
| return linkPhone; | |||||
| } | |||||
| public void setLinkPhone(String _linkPhone) { | |||||
| linkPhone = _linkPhone; | |||||
| } | |||||
| public String getPayAccount() { | |||||
| return payAccount; | |||||
| } | |||||
| public void setPayAccount(String _payAccount) { | |||||
| payAccount = _payAccount; | |||||
| } | |||||
| public String getFilename() { | |||||
| return filename; | |||||
| } | |||||
| public void setFilename(String _filename) { | |||||
| filename = _filename; | |||||
| } | |||||
| public Integer getLease() { | |||||
| return lease; | |||||
| } | |||||
| public void setLease(Integer _lease) { | |||||
| lease = _lease; | |||||
| } | |||||
| public Long getRentContractId() { | |||||
| return rentContractId; | |||||
| } | |||||
| public void setRentContractId(Long _rentContractId) { | |||||
| rentContractId = _rentContractId; | |||||
| } | |||||
| public Date getStartDate() { | |||||
| return startDate; | |||||
| } | |||||
| public void setStartDate(Date startDate) { | |||||
| this.startDate = startDate; | |||||
| } | |||||
| public Date getEndDate() { | |||||
| return endDate; | |||||
| } | |||||
| public void setEndDate(Date endDate) { | |||||
| this.endDate = endDate; | |||||
| } | |||||
| public Integer getRentShopType() { | |||||
| return rentShopType; | |||||
| } | |||||
| public void setRentShopType(Integer rentShopType) { | |||||
| this.rentShopType = rentShopType; | |||||
| } | |||||
| public Integer getAdjustPeriod() { | |||||
| return adjustPeriod; | |||||
| } | |||||
| public void setAdjustPeriod(Integer adjustPeriod) { | |||||
| this.adjustPeriod = adjustPeriod; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") | |||||
| ,MerchantId_ASC("`merchant_id` ASC"),MerchantId_DESC("`merchant_id` DESC") | |||||
| ,Price_ASC("`price` ASC"),Price_DESC("`price` DESC") | ,Price_ASC("`price` ASC"),Price_DESC("`price` DESC") | ||||
| ,RentalStartDate_ASC("`rentalStartDate` ASC"),RentalStartDate_DESC("`rentalStartDate` DESC") | |||||
| ,RentalEndDate_ASC("`rentalEndDate` ASC"),RentalEndDate_DESC("`rentalEndDate` DESC") | |||||
| ,SignDate_ASC("`signDate` ASC"),SignDate_DESC("`signDate` DESC") | |||||
| ,ReceivePeriod_ASC("`receivePeriod` ASC"),ReceivePeriod_DESC("`receivePeriod` DESC") | |||||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||||
| ,RentalStartDate_ASC("`rental_start_date` ASC"),RentalStartDate_DESC("`rental_start_date` DESC") | |||||
| ,RentalEndDate_ASC("`rental_end_date` ASC"),RentalEndDate_DESC("`rental_end_date` DESC") | |||||
| ,SignDate_ASC("`sign_date` ASC"),SignDate_DESC("`sign_date` DESC") | |||||
| ,ReceivePeriod_ASC("`receive_period` ASC"),ReceivePeriod_DESC("`receive_period` DESC") | |||||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||||
| ,Filepath_ASC("`filepath` ASC"),Filepath_DESC("`filepath` DESC") | ,Filepath_ASC("`filepath` ASC"),Filepath_DESC("`filepath` DESC") | ||||
| ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") | ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") | ||||
| ,ContractNumber_ASC("`contractNumber` ASC"),ContractNumber_DESC("`contractNumber` DESC") | |||||
| ,ContractNumber_ASC("`contract_number` ASC"),ContractNumber_DESC("`contract_number` DESC") | |||||
| ,Deposit_ASC("`deposit` ASC"),Deposit_DESC("`deposit` DESC") | ,Deposit_ASC("`deposit` ASC"),Deposit_DESC("`deposit` DESC") | ||||
| ,PayDate_ASC("`payDate` ASC"),PayDate_DESC("`payDate` DESC") | |||||
| ,IsDel_ASC("`isDel` ASC"),IsDel_DESC("`isDel` DESC") | |||||
| ,MerchantName_ASC("`merchantName` ASC"),MerchantName_DESC("`merchantName` DESC") | |||||
| ,PayDate_ASC("`pay_date` ASC"),PayDate_DESC("`pay_date` DESC") | |||||
| ,IsDel_ASC("`is_del` ASC"),IsDel_DESC("`is_del` DESC") | |||||
| ,MerchantName_ASC("`merchant_name` ASC"),MerchantName_DESC("`merchant_name` DESC") | |||||
| ,Brand_ASC("`brand` ASC"),Brand_DESC("`brand` DESC") | ,Brand_ASC("`brand` ASC"),Brand_DESC("`brand` DESC") | ||||
| ,BusinessId_ASC("`businessId` ASC"),BusinessId_DESC("`businessId` DESC") | |||||
| ,ShopType_ASC("`shopType` ASC"),ShopType_DESC("`shopType` DESC") | |||||
| ,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC") | |||||
| ,BusinessId_ASC("`business_id` ASC"),BusinessId_DESC("`business_id` DESC") | |||||
| ,ShopType_ASC("`shop_type` ASC"),ShopType_DESC("`shop_type` DESC") | |||||
| ,ShopId_ASC("`shop_id` ASC"),ShopId_DESC("`shop_id` DESC") | |||||
| ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` DESC") | ,Updatetime_ASC("`updatetime` ASC"),Updatetime_DESC("`updatetime` DESC") | ||||
| ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") | ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") | ||||
| ,RentArea_ASC("`rentArea` ASC"),RentArea_DESC("`rentArea` DESC") | |||||
| ,LinkPerson_ASC("`linkPerson` ASC"),LinkPerson_DESC("`linkPerson` DESC") | |||||
| ,LinkPhone_ASC("`linkPhone` ASC"),LinkPhone_DESC("`linkPhone` DESC") | |||||
| ,PayAccount_ASC("`payAccount` ASC"),PayAccount_DESC("`payAccount` DESC") | |||||
| ,RentArea_ASC("`rent_area` ASC"),RentArea_DESC("`rent_area` DESC") | |||||
| ,LinkPerson_ASC("`link_person` ASC"),LinkPerson_DESC("`link_person` DESC") | |||||
| ,LinkPhone_ASC("`link_phone` ASC"),LinkPhone_DESC("`link_phone` DESC") | |||||
| ,PayAccount_ASC("`pay_account` ASC"),PayAccount_DESC("`pay_account` DESC") | |||||
| ,Filename_ASC("`filename` ASC"),Filename_DESC("`filename` DESC") | ,Filename_ASC("`filename` ASC"),Filename_DESC("`filename` DESC") | ||||
| ,Lease_ASC("`lease` ASC"),Lease_DESC("`lease` DESC") | ,Lease_ASC("`lease` ASC"),Lease_DESC("`lease` DESC") | ||||
| ,RentContractId_ASC("`rentContractId` ASC"),RentContractId_DESC("`rentContractId` DESC") | |||||
| ,RentContractId_ASC("`rent_contract_id` ASC"),RentContractId_DESC("`rent_contract_id` DESC") | |||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| Field(String value){ | Field(String value){ | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import java.util.ArrayList; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_question") | @Table(name = "wx_question") | ||||
| @Data | |||||
| public class WxQuestion implements Serializable { | public class WxQuestion implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,46 +22,11 @@ public class WxQuestion implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**问题**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="问题内容",name="content") | @io.swagger.annotations.ApiModelProperty(value="问题内容",name="content") | ||||
| private String content; | private String content; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public String getContent() { | |||||
| return content; | |||||
| } | |||||
| public void setContent(String content) { | |||||
| this.content = content; | |||||
| } | |||||
| public enum Field | public enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_question_config") | @Table(name = "wx_question_config") | ||||
| @Data | |||||
| public class WxQuestionConfig implements Serializable { | public class WxQuestionConfig implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -20,120 +23,30 @@ public class WxQuestionConfig implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**问题列表**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="问题列表",name="questionList") | @io.swagger.annotations.ApiModelProperty(value="问题列表",name="questionList") | ||||
| private String questionList; | private String questionList; | ||||
| /**附着卡券列表**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="附着卡券列表",name="couponTypeList") | @io.swagger.annotations.ApiModelProperty(value="附着卡券列表",name="couponTypeList") | ||||
| private String couponTypeList; | private String couponTypeList; | ||||
| /**创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| /**更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| /**状态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="状态",name="status") | @io.swagger.annotations.ApiModelProperty(value="状态",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| /**状态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="调查力度0-100",name="strength") | @io.swagger.annotations.ApiModelProperty(value="调查力度0-100",name="strength") | ||||
| private Integer strength; | private Integer strength; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public String getQuestionList() { | |||||
| return questionList; | |||||
| } | |||||
| public void setQuestionList(String questionList) { | |||||
| this.questionList = questionList; | |||||
| } | |||||
| public String getCouponTypeList() { | |||||
| return couponTypeList; | |||||
| } | |||||
| public void setCouponTypeList(String couponTypeList) { | |||||
| this.couponTypeList = couponTypeList; | |||||
| } | |||||
| 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 getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer status) { | |||||
| this.status = status; | |||||
| } | |||||
| public Integer getStrength() { | |||||
| return strength; | |||||
| } | |||||
| public void setStrength(Integer strength) { | |||||
| this.strength = strength; | |||||
| } | |||||
| @Transient | @Transient | ||||
| protected List<WxQuestion> questions; | protected List<WxQuestion> questions; | ||||
| public List<WxQuestion> getQuestions() { | |||||
| return questions; | |||||
| } | |||||
| public void setQuestions(List<WxQuestion> questions) { | |||||
| this.questions = questions; | |||||
| } | |||||
| public enum Field | public enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_question_log") | @Table(name = "wx_question_log") | ||||
| @Data | |||||
| public class WxQuestionLog implements Serializable { | public class WxQuestionLog implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -20,27 +23,8 @@ public class WxQuestionLog implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**用户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") | @io.swagger.annotations.ApiModelProperty(value="用户ID",name="userId") | ||||
| private Long userId; | private Long userId; | ||||
| /**问题ID**/ | /**问题ID**/ | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_refund_order") | @Table(name = "wx_refund_order") | ||||
| @Data | |||||
| public class WxRefundOrder implements Serializable { | public class WxRefundOrder implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,166 +21,38 @@ public class WxRefundOrder implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| /*微信生成的订单号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") | @io.swagger.annotations.ApiModelProperty(value="微信生成的订单号",name="transactionId") | ||||
| private String transactionId; | private String transactionId; | ||||
| /*订单ID-out_trade_no**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="订单ID-out_trade_no",name="orderId") | @io.swagger.annotations.ApiModelProperty(value="订单ID-out_trade_no",name="orderId") | ||||
| private Long orderId; | private Long orderId; | ||||
| /*支付订单号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") | @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="payOrderNo") | ||||
| private String payOrderNo; | private String payOrderNo; | ||||
| /*用户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="用户ID",name="cUserId") | ||||
| private Long cUserId; | private Long cUserId; | ||||
| /*订单总金额(分)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="订单总金额(分)",name="totalFee") | @io.swagger.annotations.ApiModelProperty(value="订单总金额(分)",name="totalFee") | ||||
| private Integer totalFee; | private Integer totalFee; | ||||
| /*退款总金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="退款总金额",name="refundFee") | @io.swagger.annotations.ApiModelProperty(value="退款总金额",name="refundFee") | ||||
| private Integer refundFee; | private Integer refundFee; | ||||
| /*退款发起时间(秒)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="退款发起时间(秒)",name="refundTimeStart") | @io.swagger.annotations.ApiModelProperty(value="退款发起时间(秒)",name="refundTimeStart") | ||||
| private Date refundTimeStart; | private Date refundTimeStart; | ||||
| /*退款结束时间(秒)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="退款结束时间(秒)",name="refundTimeEnd") | @io.swagger.annotations.ApiModelProperty(value="退款结束时间(秒)",name="refundTimeEnd") | ||||
| private Date refundTimeEnd; | private Date refundTimeEnd; | ||||
| /*支付渠道: 0-微信 1-支付宝 2-银联 **/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="refundVendor") | @io.swagger.annotations.ApiModelProperty(value="支付渠道: 0-微信 1-支付宝 2-银联 ",name="refundVendor") | ||||
| private Integer refundVendor; | private Integer refundVendor; | ||||
| /*支付状态: 0-退款中;1-退款成功;2-退款失败**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-退款中;1-退款成功;2-退款失败",name="refundOrderStatus") | @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-退款中;1-退款成功;2-退款失败",name="refundOrderStatus") | ||||
| private Integer refundOrderStatus; | private Integer refundOrderStatus; | ||||
| /*微信退款单号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信退款单号",name="refundId") | @io.swagger.annotations.ApiModelProperty(value="微信退款单号",name="refundId") | ||||
| private String refundId; | private String refundId; | ||||
| /*支付失败原因**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") | @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") | ||||
| private String failReason; | private String failReason; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public Date getCreateTime() { | |||||
| return createTime; | |||||
| } | |||||
| public void setCreateTime(Date _createTime) { | |||||
| createTime = _createTime; | |||||
| } | |||||
| public Date getUpdateTime() { | |||||
| return updateTime; | |||||
| } | |||||
| public void setUpdateTime(Date _updateTime) { | |||||
| updateTime = _updateTime; | |||||
| } | |||||
| public String getTransactionId() { | |||||
| return transactionId; | |||||
| } | |||||
| public void setTransactionId(String _transactionId) { | |||||
| transactionId = _transactionId; | |||||
| } | |||||
| public Long getOrderId() { | |||||
| return orderId; | |||||
| } | |||||
| public void setOrderId(Long _orderId) { | |||||
| orderId = _orderId; | |||||
| } | |||||
| public String getPayOrderNo() { | |||||
| return payOrderNo; | |||||
| } | |||||
| public void setPayOrderNo(String _payOrderNo) { | |||||
| payOrderNo = _payOrderNo; | |||||
| } | |||||
| public Long getCUserId() { | |||||
| return cUserId; | |||||
| } | |||||
| public void setCUserId(Long _cUserId) { | |||||
| cUserId = _cUserId; | |||||
| } | |||||
| public Integer getTotalFee() { | |||||
| return totalFee; | |||||
| } | |||||
| public void setTotalFee(Integer _totalFee) { | |||||
| totalFee = _totalFee; | |||||
| } | |||||
| public Integer getRefundFee() { | |||||
| return refundFee; | |||||
| } | |||||
| public void setRefundFee(Integer _refundFee) { | |||||
| refundFee = _refundFee; | |||||
| } | |||||
| public Date getRefundTimeStart() { | |||||
| return refundTimeStart; | |||||
| } | |||||
| public void setRefundTimeStart(Date _refundTimeStart) { | |||||
| refundTimeStart = _refundTimeStart; | |||||
| } | |||||
| public Date getRefundTimeEnd() { | |||||
| return refundTimeEnd; | |||||
| } | |||||
| public void setRefundTimeEnd(Date _refundTimeEnd) { | |||||
| refundTimeEnd = _refundTimeEnd; | |||||
| } | |||||
| public Integer getRefundVendor() { | |||||
| return refundVendor; | |||||
| } | |||||
| public void setRefundVendor(Integer _refundVendor) { | |||||
| refundVendor = _refundVendor; | |||||
| } | |||||
| public Integer getRefundOrderStatus() { | |||||
| return refundOrderStatus; | |||||
| } | |||||
| public void setRefundOrderStatus(Integer _refundOrderStatus) { | |||||
| refundOrderStatus = _refundOrderStatus; | |||||
| } | |||||
| public String getRefundId() { | |||||
| return refundId; | |||||
| } | |||||
| public void setRefundId(String _refundId) { | |||||
| refundId = _refundId; | |||||
| } | |||||
| public String getFailReason() { | |||||
| return failReason; | |||||
| } | |||||
| public void setFailReason(String _failReason) { | |||||
| failReason = _failReason; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -1,6 +1,10 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.iformall.common.SortColumn; | import com.iformall.common.SortColumn; | ||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import lombok.ToString; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -13,6 +17,9 @@ import java.util.Map; | |||||
| * @author gongbiao | * @author gongbiao | ||||
| */ | */ | ||||
| @Table(name = "wx_rent_contract") | @Table(name = "wx_rent_contract") | ||||
| @Data | |||||
| @ToString(callSuper = true) | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxRentContract extends BaseEntity { | public class WxRentContract extends BaseEntity { | ||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -26,21 +33,6 @@ public class WxRentContract extends BaseEntity { | |||||
| super.setSortColumns(this.sortColumns); | super.setSortColumns(this.sortColumns); | ||||
| return super.getSortColumns(); | return super.getSortColumns(); | ||||
| } | } | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @Transient | @Transient | ||||
| @SortColumn(column = "shopNumber") | @SortColumn(column = "shopNumber") | ||||
| @@ -93,159 +85,48 @@ public class WxRentContract extends BaseEntity { | |||||
| private Integer latePayPrice; | private Integer latePayPrice; | ||||
| /** | |||||
| * 月计租方式 3按自然月 | |||||
| * adjustPeriod 1日 2月 monthHandleType 2按账单周期 3按自然月 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "月计租方式3按自然月", name = "merchantId") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "月计租方式 3按自然月, adjustPeriod 1日 2月 monthHandleType 2按账单周期 3按自然月", name = "monthHandleType") | |||||
| @Transient | @Transient | ||||
| private Integer monthHandleType; | private Integer monthHandleType; | ||||
| public Integer getAllPeriod() { | |||||
| return allPeriod; | |||||
| } | |||||
| public void setAllPeriod(Integer allPeriod) { | |||||
| this.allPeriod = allPeriod; | |||||
| } | |||||
| public Integer getPeriod() { | |||||
| return period; | |||||
| } | |||||
| public void setPeriod(Integer period) { | |||||
| this.period = period; | |||||
| } | |||||
| public Integer getNeedPay() { | |||||
| return needPay; | |||||
| } | |||||
| public void setNeedPay(Integer needPay) { | |||||
| this.needPay = needPay; | |||||
| } | |||||
| public Integer getReceivePay() { | |||||
| return receivePay; | |||||
| } | |||||
| public void setReceivePay(Integer receivePay) { | |||||
| this.receivePay = receivePay; | |||||
| } | |||||
| public Integer getOwe() { | |||||
| return owe; | |||||
| } | |||||
| public void setOwe(Integer owe) { | |||||
| this.owe = owe; | |||||
| } | |||||
| public String getReceiveDate() { | |||||
| return receiveDate; | |||||
| } | |||||
| public void setReceiveDate(String receiveDate) { | |||||
| this.receiveDate = receiveDate; | |||||
| } | |||||
| public Integer getLatePayPrice() { | |||||
| return latePayPrice; | |||||
| } | |||||
| public void setLatePayPrice(Integer latePayPrice) { | |||||
| this.latePayPrice = latePayPrice; | |||||
| } | |||||
| public Integer getMonthHandleType() { | |||||
| return monthHandleType; | |||||
| } | |||||
| public void setMonthHandleType(Integer monthHandleType) { | |||||
| this.monthHandleType = monthHandleType; | |||||
| } | |||||
| public String getBuilding() { | |||||
| return building; | |||||
| } | |||||
| public void setBuilding(String building) { | |||||
| this.building = building; | |||||
| } | |||||
| public String getFloor() { | |||||
| return floor; | |||||
| } | |||||
| public void setFloor(String floor) { | |||||
| this.floor = floor; | |||||
| } | |||||
| public String getShopNumber() { | |||||
| return shopNumber; | |||||
| } | |||||
| public void setShopNumber(String shopNumber) { | |||||
| this.shopNumber = shopNumber; | |||||
| } | |||||
| /*商户**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") | @io.swagger.annotations.ApiModelProperty(value = "商户", name = "merchantId") | ||||
| private Long merchantId; | private Long merchantId; | ||||
| /*月租金/分成(分)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price") | @io.swagger.annotations.ApiModelProperty(value = "月租金/分成(分)", name = "price") | ||||
| private Long price; | private Long price; | ||||
| /*计租开始时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "计租开始时间", name = "rentalStartDate") | @io.swagger.annotations.ApiModelProperty(value = "计租开始时间", name = "rentalStartDate") | ||||
| private Date rentalStartDate; | private Date rentalStartDate; | ||||
| /*计租结束时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "计租结束时间", name = "rentalEndDate") | @io.swagger.annotations.ApiModelProperty(value = "计租结束时间", name = "rentalEndDate") | ||||
| private Date rentalEndDate; | private Date rentalEndDate; | ||||
| /*签定合同时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "签定合同时间", name = "signDate") | @io.swagger.annotations.ApiModelProperty(value = "签定合同时间", name = "signDate") | ||||
| private Date signDate; | private Date signDate; | ||||
| /*付款周期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "付款周期", name = "receivePeriod") | @io.swagger.annotations.ApiModelProperty(value = "付款周期", name = "receivePeriod") | ||||
| private Integer receivePeriod; | private Integer receivePeriod; | ||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*合同文件路径**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") | @io.swagger.annotations.ApiModelProperty(value = "合同文件路径", name = "filepath") | ||||
| private String filepath; | private String filepath; | ||||
| /*合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "合同进度状态1待签约2已签约未记租3计租中4提前终止5合同到期", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| /*合同编号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") | @io.swagger.annotations.ApiModelProperty(value = "合同编号", name = "contractNumber") | ||||
| private String contractNumber; | private String contractNumber; | ||||
| /*押金**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") | @io.swagger.annotations.ApiModelProperty(value = "押金", name = "deposit") | ||||
| private Long deposit; | private Long deposit; | ||||
| /*交租日 计租开始时间减去交租日的天数为基数 提前多少日交租**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") | @io.swagger.annotations.ApiModelProperty(value = "交租日 计租开始时间减去交租日的天数为基数 提前多少日交租", name = "payDate") | ||||
| @SortColumn(column = "payDate") | @SortColumn(column = "payDate") | ||||
| private Integer payDate; | private Integer payDate; | ||||
| /*是否删除1是0否**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") | @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") | ||||
| private Integer isDel; | private Integer isDel; | ||||
| /*商户名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") | @io.swagger.annotations.ApiModelProperty(value = "商户名称", name = "merchantName") | ||||
| private String merchantName; | private String merchantName; | ||||
| /*经营品牌**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "经营品牌", name = "brand") | @io.swagger.annotations.ApiModelProperty(value = "经营品牌", name = "brand") | ||||
| private Long brand; | private Long brand; | ||||
| /*经常业态ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "经常业态ID", name = "businessId") | @io.swagger.annotations.ApiModelProperty(value = "经常业态ID", name = "businessId") | ||||
| private Integer businessId; | private Integer businessId; | ||||
| /*店铺类型**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "店铺类型", name = "shopType") | @io.swagger.annotations.ApiModelProperty(value = "店铺类型", name = "shopType") | ||||
| private Integer shopType; | private Integer shopType; | ||||
| /*商铺ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "商铺ID", name = "shopId") | @io.swagger.annotations.ApiModelProperty(value = "商铺ID", name = "shopId") | ||||
| private Long shopId; | private Long shopId; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") | @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updatetime") | ||||
| private Date updatetime; | private Date updatetime; | ||||
| @@ -315,12 +196,10 @@ public class WxRentContract extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "装修期结束时间", name = "fixEndDate") | @io.swagger.annotations.ApiModelProperty(value = "装修期结束时间", name = "fixEndDate") | ||||
| private Date fixEndDate; | private Date fixEndDate; | ||||
| // 租赁合同预账单列表 | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value = "租赁合同预账单列表", name = "previewBillRentList") | @io.swagger.annotations.ApiModelProperty(value = "租赁合同预账单列表", name = "previewBillRentList") | ||||
| private List<WxBillRent> previewBillRentList; | private List<WxBillRent> previewBillRentList; | ||||
| // 物业合同预账单列表 | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value = "物业合同预账单列表", name = "reviewBillPropertyPList") | @io.swagger.annotations.ApiModelProperty(value = "物业合同预账单列表", name = "reviewBillPropertyPList") | ||||
| private List<WxBillProperty> reviewBillPropertyPList; | private List<WxBillProperty> reviewBillPropertyPList; | ||||
| @@ -343,424 +222,28 @@ public class WxRentContract extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") | @io.swagger.annotations.ApiModelProperty(value = "租金单位1日2月3年", name = "priceUnit") | ||||
| private Integer priceUnit; | private Integer priceUnit; | ||||
| public Integer getPriceUnit() { | |||||
| return priceUnit; | |||||
| } | |||||
| public void setPriceUnit(Integer priceUnit) { | |||||
| this.priceUnit = priceUnit; | |||||
| } | |||||
| public Integer getTotalPeriodMonth() { | |||||
| return totalPeriodMonth; | |||||
| } | |||||
| public void setTotalPeriodMonth(Integer totalPeriodMonth) { | |||||
| this.totalPeriodMonth = totalPeriodMonth; | |||||
| } | |||||
| public Integer getTotalPeriodDay() { | |||||
| return totalPeriodDay; | |||||
| } | |||||
| public void setTotalPeriodDay(Integer totalPeriodDay) { | |||||
| this.totalPeriodDay = totalPeriodDay; | |||||
| } | |||||
| public Integer getRentPrice() { | |||||
| return rentPrice; | |||||
| } | |||||
| public void setRentPrice(Integer rentPrice) { | |||||
| this.rentPrice = rentPrice; | |||||
| } | |||||
| public String getRentInfo() { | |||||
| return rentInfo; | |||||
| } | |||||
| public void setRentInfo(String rentInfo) { | |||||
| this.rentInfo = rentInfo; | |||||
| } | |||||
| public List<WxBillProperty> getReviewBillPropertyPList() { | |||||
| return reviewBillPropertyPList; | |||||
| } | |||||
| public void setReviewBillPropertyPList(List<WxBillProperty> reviewBillPropertyPList) { | |||||
| this.reviewBillPropertyPList = reviewBillPropertyPList; | |||||
| } | |||||
| public List<WxBillRent> getPreviewBillRentList() { | |||||
| return previewBillRentList; | |||||
| } | |||||
| public void setPreviewBillRentList(List<WxBillRent> previewBillRentList) { | |||||
| this.previewBillRentList = previewBillRentList; | |||||
| } | |||||
| public Integer getBusinessType() { | |||||
| return businessType; | |||||
| } | |||||
| public void setBusinessType(Integer businessType) { | |||||
| this.businessType = businessType; | |||||
| } | |||||
| public Date getFixStartDate() { | |||||
| return fixStartDate; | |||||
| } | |||||
| public void setFixStartDate(Date fixStartDate) { | |||||
| this.fixStartDate = fixStartDate; | |||||
| } | |||||
| public Date getFixEndDate() { | |||||
| return fixEndDate; | |||||
| } | |||||
| public void setFixEndDate(Date fixEndDate) { | |||||
| this.fixEndDate = fixEndDate; | |||||
| } | |||||
| public Map<String, Object> getFlowParams() { | |||||
| return flowParams; | |||||
| } | |||||
| public void setFlowParams(Map<String, Object> flowParams) { | |||||
| this.flowParams = flowParams; | |||||
| } | |||||
| public Integer getApplyStatus() { | |||||
| return applyStatus; | |||||
| } | |||||
| public void setApplyStatus(Integer applyStatus) { | |||||
| this.applyStatus = applyStatus; | |||||
| } | |||||
| public Long getMerchantId() { | |||||
| return merchantId; | |||||
| } | |||||
| public void setMerchantId(Long _merchantId) { | |||||
| merchantId = _merchantId; | |||||
| } | |||||
| public Long getPrice() { | |||||
| return price; | |||||
| } | |||||
| public void setPrice(Long _price) { | |||||
| price = _price; | |||||
| } | |||||
| public Date getRentalStartDate() { | |||||
| return rentalStartDate; | |||||
| } | |||||
| public void setRentalStartDate(Date _rentalStartDate) { | |||||
| rentalStartDate = _rentalStartDate; | |||||
| } | |||||
| public Date getRentalEndDate() { | |||||
| return rentalEndDate; | |||||
| } | |||||
| public void setRentalEndDate(Date _rentalEndDate) { | |||||
| rentalEndDate = _rentalEndDate; | |||||
| } | |||||
| public Date getSignDate() { | |||||
| return signDate; | |||||
| } | |||||
| public void setSignDate(Date _signDate) { | |||||
| signDate = _signDate; | |||||
| } | |||||
| public Integer getReceivePeriod() { | |||||
| return receivePeriod; | |||||
| } | |||||
| public void setReceivePeriod(Integer _receivePeriod) { | |||||
| receivePeriod = _receivePeriod; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getFilepath() { | |||||
| return filepath; | |||||
| } | |||||
| public void setFilepath(String _filepath) { | |||||
| filepath = _filepath; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer _status) { | |||||
| status = _status; | |||||
| } | |||||
| public String getContractNumber() { | |||||
| return contractNumber; | |||||
| } | |||||
| public void setContractNumber(String _contractNumber) { | |||||
| contractNumber = _contractNumber; | |||||
| } | |||||
| public Long getDeposit() { | |||||
| return deposit; | |||||
| } | |||||
| public void setDeposit(Long _deposit) { | |||||
| deposit = _deposit; | |||||
| } | |||||
| public Integer getPayDate() { | |||||
| return payDate; | |||||
| } | |||||
| public void setPayDate(Integer _payDate) { | |||||
| payDate = _payDate; | |||||
| } | |||||
| public Integer getIsDel() { | |||||
| return isDel; | |||||
| } | |||||
| public void setIsDel(Integer _isDel) { | |||||
| isDel = _isDel; | |||||
| } | |||||
| public String getMerchantName() { | |||||
| return merchantName; | |||||
| } | |||||
| public void setMerchantName(String _merchantName) { | |||||
| merchantName = _merchantName; | |||||
| } | |||||
| public Long getBrand() { | |||||
| return brand; | |||||
| } | |||||
| public void setBrand(Long _brand) { | |||||
| brand = _brand; | |||||
| } | |||||
| public Integer getBusinessId() { | |||||
| return businessId; | |||||
| } | |||||
| public void setBusinessId(Integer _businessId) { | |||||
| businessId = _businessId; | |||||
| } | |||||
| public Integer getShopType() { | |||||
| return shopType; | |||||
| } | |||||
| public void setShopType(Integer _shopType) { | |||||
| shopType = _shopType; | |||||
| } | |||||
| public Long getShopId() { | |||||
| return shopId; | |||||
| } | |||||
| public void setShopId(Long _shopId) { | |||||
| shopId = _shopId; | |||||
| } | |||||
| public Date getUpdatetime() { | |||||
| return updatetime; | |||||
| } | |||||
| public void setUpdatetime(Date _updatetime) { | |||||
| updatetime = _updatetime; | |||||
| } | |||||
| public Date getCreatetime() { | |||||
| return createtime; | |||||
| } | |||||
| public void setCreatetime(Date createtime) { | |||||
| this.createtime = createtime; | |||||
| } | |||||
| public String getRentArea() { | |||||
| return rentArea; | |||||
| } | |||||
| public void setRentArea(String rentArea) { | |||||
| this.rentArea = rentArea; | |||||
| } | |||||
| public String getLinkPerson() { | |||||
| return linkPerson; | |||||
| } | |||||
| public void setLinkPerson(String linkPerson) { | |||||
| this.linkPerson = linkPerson; | |||||
| } | |||||
| public String getLinkPhone() { | |||||
| return linkPhone; | |||||
| } | |||||
| public void setLinkPhone(String linkPhone) { | |||||
| this.linkPhone = linkPhone; | |||||
| } | |||||
| public String getPayAccount() { | |||||
| return payAccount; | |||||
| } | |||||
| public void setPayAccount(String payAccount) { | |||||
| this.payAccount = payAccount; | |||||
| } | |||||
| public String getFilename() { | |||||
| return filename; | |||||
| } | |||||
| public void setFilename(String filename) { | |||||
| this.filename = filename; | |||||
| } | |||||
| public Integer getLease() { | |||||
| return lease; | |||||
| } | |||||
| public void setLease(Integer lease) { | |||||
| this.lease = lease; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer type) { | |||||
| this.type = type; | |||||
| } | |||||
| public String getAdjustRatio() { | |||||
| return adjustRatio; | |||||
| } | |||||
| public void setAdjustRatio(String adjustRatio) { | |||||
| this.adjustRatio = adjustRatio; | |||||
| } | |||||
| public Integer getAdjustPeriod() { | |||||
| return adjustPeriod; | |||||
| } | |||||
| public void setAdjustPeriod(Integer adjustPeriod) { | |||||
| this.adjustPeriod = adjustPeriod; | |||||
| } | |||||
| public Integer getPayRatio() { | |||||
| return payRatio; | |||||
| } | |||||
| public void setPayRatio(Integer payRatio) { | |||||
| this.payRatio = payRatio; | |||||
| } | |||||
| public Long getRevenue() { | |||||
| return revenue; | |||||
| } | |||||
| public void setRevenue(Long revenue) { | |||||
| this.revenue = revenue; | |||||
| } | |||||
| public Date getStartDate() { | |||||
| return startDate; | |||||
| } | |||||
| public void setStartDate(Date startDate) { | |||||
| this.startDate = startDate; | |||||
| } | |||||
| public Date getEndDate() { | |||||
| return endDate; | |||||
| } | |||||
| public void setEndDate(Date endDate) { | |||||
| this.endDate = endDate; | |||||
| } | |||||
| public String getBrandName() { | |||||
| return brandName; | |||||
| } | |||||
| public void setBrandName(String brandName) { | |||||
| this.brandName = brandName; | |||||
| } | |||||
| public String getBankName() { | |||||
| return bankName; | |||||
| } | |||||
| public void setBankName(String bankName) { | |||||
| this.bankName = bankName; | |||||
| } | |||||
| public Integer getRentShopType() { | |||||
| return rentShopType; | |||||
| } | |||||
| public void setRentShopType(Integer rentShopType) { | |||||
| this.rentShopType = rentShopType; | |||||
| } | |||||
| public String getBuildArea() { | |||||
| return buildArea; | |||||
| } | |||||
| public void setBuildArea(String buildArea) { | |||||
| this.buildArea = buildArea; | |||||
| } | |||||
| public String getFileNames() { | |||||
| return fileNames; | |||||
| } | |||||
| public void setFileNames(String fileNames) { | |||||
| this.fileNames = fileNames; | |||||
| } | |||||
| public String getPriceStr() { | |||||
| return priceStr; | |||||
| } | |||||
| public void setPriceStr(String priceStr) { | |||||
| this.priceStr = priceStr; | |||||
| } | |||||
| public String getDepositStr() { | |||||
| return depositStr; | |||||
| } | |||||
| public void setDepositStr(String depositStr) { | |||||
| this.depositStr = depositStr; | |||||
| } | |||||
| public static enum Field { | public static enum Field { | ||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), Price_ASC("`price` ASC"), Price_DESC("`price` DESC"), RentalStartDate_ASC("`rental_start_date` ASC"), RentalStartDate_DESC("`rental_start_date` DESC"), RentalEndDate_ASC("`rental_end_date` ASC"), RentalEndDate_DESC("`rental_end_date` DESC"), SignDate_ASC("`sign_date` ASC"), SignDate_DESC("`sign_date` DESC"), ReceivePeriod_ASC("`receive_period` ASC"), ReceivePeriod_DESC("`receive_period` DESC"), TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), Filepath_ASC("`filepath` ASC"), Filepath_DESC("`filepath` DESC"), Status_ASC("`status` ASC"), Status_DESC("`status` DESC"), ContractNumber_ASC("`contract_number` ASC"), ContractNumber_DESC("`contract_number` DESC"), Deposit_ASC("`deposit` ASC"), Deposit_DESC("`deposit` DESC"), PayDate_ASC("`pay_date` ASC"), PayDate_DESC("`pay_date` DESC"), IsDel_ASC("`is_del` ASC"), IsDel_DESC("`is_del` DESC"), MerchantName_ASC("`merchant_name` ASC"), MerchantName_DESC("`merchant_name` DESC"), Brand_ASC("`brand` ASC"), Brand_DESC("`brand` DESC"), BusinessId_ASC("`business_id` ASC"), BusinessId_DESC("`business_id` DESC"), ShopType_ASC("`shop_type` ASC"), ShopType_DESC("`shop_type` DESC"), ShopId_ASC("`shop_id` ASC"), ShopId_DESC("`shop_id` DESC"), Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC"), Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC"); | |||||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC") | |||||
| , MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC") | |||||
| , Price_ASC("`price` ASC"), Price_DESC("`price` DESC") | |||||
| , RentalStartDate_ASC("`rental_start_date` ASC"), RentalStartDate_DESC("`rental_start_date` DESC") | |||||
| , RentalEndDate_ASC("`rental_end_date` ASC"), RentalEndDate_DESC("`rental_end_date` DESC") | |||||
| , SignDate_ASC("`sign_date` ASC"), SignDate_DESC("`sign_date` DESC") | |||||
| , ReceivePeriod_ASC("`receive_period` ASC"), ReceivePeriod_DESC("`receive_period` DESC") | |||||
| , TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC") | |||||
| , Filepath_ASC("`filepath` ASC"), Filepath_DESC("`filepath` DESC") | |||||
| , Status_ASC("`status` ASC"), Status_DESC("`status` DESC") | |||||
| , ContractNumber_ASC("`contract_number` ASC"), ContractNumber_DESC("`contract_number` DESC") | |||||
| , Deposit_ASC("`deposit` ASC"), Deposit_DESC("`deposit` DESC") | |||||
| , PayDate_ASC("`pay_date` ASC"), PayDate_DESC("`pay_date` DESC") | |||||
| , IsDel_ASC("`is_del` ASC"), IsDel_DESC("`is_del` DESC") | |||||
| , MerchantName_ASC("`merchant_name` ASC"), MerchantName_DESC("`merchant_name` DESC") | |||||
| , Brand_ASC("`brand` ASC"), Brand_DESC("`brand` DESC") | |||||
| , BusinessId_ASC("`business_id` ASC"), BusinessId_DESC("`business_id` DESC") | |||||
| , ShopType_ASC("`shop_type` ASC"), ShopType_DESC("`shop_type` DESC") | |||||
| , ShopId_ASC("`shop_id` ASC"), ShopId_DESC("`shop_id` DESC") | |||||
| , Updatetime_ASC("`updatetime` ASC"), Updatetime_DESC("`updatetime` DESC") | |||||
| , Createtime_ASC("`createtime` ASC"), Createtime_DESC("`createtime` DESC"); | |||||
| private String value; | private String value; | ||||
| Field(String value) { | Field(String value) { | ||||
| @@ -23,44 +23,34 @@ public class WxScoreHistory implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**会员ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="会员ID",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="会员ID",name="cUserId") | ||||
| private Long cUserId; | private Long cUserId; | ||||
| /**创建日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**成长值类型(1:每日登录, 2:消费,3:绑车牌,4:连接wifi,5:微信昵称授权,6:微信手机授权)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="成长值类型",name="scoreType") | |||||
| @io.swagger.annotations.ApiModelProperty(value="/**成长值类型(1:每日登录, 2:消费,3:绑车牌,4:连接wifi,5:微信昵称授权,6:微信手机授权)**/",name="scoreType") | |||||
| private Integer scoreType; | private Integer scoreType; | ||||
| /**有效日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="有效日期",name="validDate") | @io.swagger.annotations.ApiModelProperty(value="有效日期",name="validDate") | ||||
| private Date validDate; | private Date validDate; | ||||
| /**单据号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="单据号",name="orderId") | @io.swagger.annotations.ApiModelProperty(value="单据号",name="orderId") | ||||
| private Long orderId; | private Long orderId; | ||||
| /**支付方式**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付方式",name="payType") | @io.swagger.annotations.ApiModelProperty(value="支付方式",name="payType") | ||||
| private Integer payType; | private Integer payType; | ||||
| /**支付金额**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付金额",name="payAmount") | @io.swagger.annotations.ApiModelProperty(value="支付金额",name="payAmount") | ||||
| private Integer payAmount; | private Integer payAmount; | ||||
| /**积分**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="积分",name="scoreAmount") | @io.swagger.annotations.ApiModelProperty(value="积分",name="scoreAmount") | ||||
| private Integer scoreAmount; | private Integer scoreAmount; | ||||
| /**扣减原因**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="扣减原因",name="reason") | @io.swagger.annotations.ApiModelProperty(value="扣减原因",name="reason") | ||||
| private String reason; | private String reason; | ||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="开始时间",name="startdate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="查询-开始时间",name="startdate") | |||||
| private Date startdate; | private Date startdate; | ||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value="结束时间",name="enddate") | |||||
| @io.swagger.annotations.ApiModelProperty(value="查询-结束时间",name="enddate") | |||||
| private Date enddate; | private Date enddate; | ||||
| public static enum Field | public static enum Field | ||||
| @@ -86,38 +86,16 @@ public class WxScoreRules implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value="规则",name="rules") | @io.swagger.annotations.ApiModelProperty(value="规则",name="rules") | ||||
| private String rules; | private String rules; | ||||
| /**创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @@ -127,13 +105,6 @@ public class WxScoreRules implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="清除前多少年积分",name="clearYear") | @io.swagger.annotations.ApiModelProperty(value="清除前多少年积分",name="clearYear") | ||||
| private Integer clearYear; | private Integer clearYear; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public static String getScoreDefaultRules() { | public static String getScoreDefaultRules() { | ||||
| return scoreDefaultRules; | return scoreDefaultRules; | ||||
| } | } | ||||
| @@ -142,15 +113,6 @@ public class WxScoreRules implements Serializable { | |||||
| return creditDefaultRules; | return creditDefaultRules; | ||||
| } | } | ||||
| public void setRules(String rules) { | |||||
| this.rules = rules; | |||||
| } | |||||
| public String getRules() { | |||||
| return rules; | |||||
| } | |||||
| public Integer getRule(EnumScoreType scoreType, String element) { | public Integer getRule(EnumScoreType scoreType, String element) { | ||||
| if (rules == null) | if (rules == null) | ||||
| return null; | return null; | ||||
| @@ -191,19 +153,6 @@ public class WxScoreRules implements Serializable { | |||||
| return null; | return null; | ||||
| } | } | ||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_score_validity_period") | @Table(name = "wx_score_validity_period") | ||||
| @Data | |||||
| public class WxScoreValidityPeriod implements Serializable { | public class WxScoreValidityPeriod implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,74 +21,28 @@ public class WxScoreValidityPeriod implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*年**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="年",name="year") | @io.swagger.annotations.ApiModelProperty(value="年",name="year") | ||||
| private String year; | private String year; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getYear() { | |||||
| return year; | |||||
| } | |||||
| public void setYear(String _year) { | |||||
| year = _year; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||||
| ,Year_ASC("`year` ASC"),Year_DESC("`year` DESC") | ,Year_ASC("`year` ASC"),Year_DESC("`year` DESC") | ||||
| ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") | |||||
| ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") | |||||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||||
| ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") | |||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| Field(String value){ | Field(String value){ | ||||
| @@ -1,5 +1,9 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import lombok.ToString; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +13,9 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_screen_ad") | @Table(name = "wx_screen_ad") | ||||
| @Data | |||||
| @ToString(callSuper = true) | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxScreenAd extends BaseEntity { | public class WxScreenAd extends BaseEntity { | ||||
| @Id | @Id | ||||
| @@ -19,159 +26,45 @@ public class WxScreenAd extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| @Override | @Override | ||||
| public String getSortColumns() { | public String getSortColumns() { | ||||
| super.setSortColumns(this.sortColumns); | super.setSortColumns(this.sortColumns); | ||||
| return super.getSortColumns(); | return super.getSortColumns(); | ||||
| } | } | ||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**标题**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="标题",name="title") | @io.swagger.annotations.ApiModelProperty(value="标题",name="title") | ||||
| private String title; | private String title; | ||||
| /**广告类型**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="广告类型",name="type") | @io.swagger.annotations.ApiModelProperty(value="广告类型",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /**广告子类型 (券渠道)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="广告子类型",name="subType") | |||||
| @io.swagger.annotations.ApiModelProperty(value="广告子类型 (券渠道)",name="subType") | |||||
| private Integer subType; | private Integer subType; | ||||
| /**广告状态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="设备状态",name="status") | |||||
| @io.swagger.annotations.ApiModelProperty(value="广告状态",name="status") | |||||
| private Integer status; | private Integer status; | ||||
| /**创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /**更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /**封面**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="封面",name="coverImg") | @io.swagger.annotations.ApiModelProperty(value="封面",name="coverImg") | ||||
| private String coverImg; | private String coverImg; | ||||
| /**广告目标ID: couponChannelId or campaignId**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="广告目标ID",name="targetId") | |||||
| @io.swagger.annotations.ApiModelProperty(value="广告目标ID: couponChannelId or campaignId",name="targetId") | |||||
| private Long targetId; | private Long targetId; | ||||
| /**广告目标二维码**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="二维码",name="qrcode") | |||||
| @io.swagger.annotations.ApiModelProperty(value="广告目标二维码",name="qrcode") | |||||
| private byte[] qrcode; | private byte[] qrcode; | ||||
| @Transient | @Transient | ||||
| protected Object target; | protected Object target; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String tenantId) { | |||||
| this.tenantId = tenantId; | |||||
| } | |||||
| public String getTitle() { | |||||
| return title; | |||||
| } | |||||
| public void setTitle(String title) { | |||||
| this.title = title; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer type) { | |||||
| this.type = type; | |||||
| } | |||||
| public Integer getSubType() { | |||||
| return subType; | |||||
| } | |||||
| public void setSubType(Integer subType) { | |||||
| this.subType = subType; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer status) { | |||||
| this.status = status; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date createDate) { | |||||
| this.createDate = createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date updateDate) { | |||||
| this.updateDate = updateDate; | |||||
| } | |||||
| public String getCoverImg() { | |||||
| return coverImg; | |||||
| } | |||||
| public void setCoverImg(String coverImg) { | |||||
| this.coverImg = coverImg; | |||||
| } | |||||
| public Object getTarget() { | |||||
| return target; | |||||
| } | |||||
| public void setTarget(Object target) { | |||||
| this.target = target; | |||||
| } | |||||
| public Long getTargetId() { | |||||
| return targetId; | |||||
| } | |||||
| public void setTargetId(Long targetId) { | |||||
| this.targetId = targetId; | |||||
| } | |||||
| public byte[] getQrcode() { | |||||
| return qrcode; | |||||
| } | |||||
| public void setQrcode(byte[] qrcode) { | |||||
| this.qrcode = qrcode; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -2,6 +2,10 @@ package com.iformall.domain.po; | |||||
| import cn.afterturn.easypoi.excel.annotation.Excel; | import cn.afterturn.easypoi.excel.annotation.Excel; | ||||
| import com.iformall.common.SortColumn; | import com.iformall.common.SortColumn; | ||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import lombok.ToString; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -10,6 +14,9 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_shop") | @Table(name = "wx_shop") | ||||
| @Data | |||||
| @ToString(callSuper = true) | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxShop extends BaseEntity { | public class WxShop extends BaseEntity { | ||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -17,22 +24,6 @@ public class WxShop extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| protected List<String> ids; | protected List<String> ids; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| @Transient | @Transient | ||||
| private Long rentContractId; | private Long rentContractId; | ||||
| @@ -47,60 +38,62 @@ public class WxShop extends BaseEntity { | |||||
| return super.getSortColumns(); | return super.getSortColumns(); | ||||
| } | } | ||||
| /*租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| @io.swagger.annotations.ApiModelProperty(value = "点位类型", name = "pointType") | |||||
| @Excel(name="类型",width = 20,orderNum = "1", | @Excel(name="类型",width = 20,orderNum = "1", | ||||
| replace = {"商铺_null", "固定点位_1", "临时促销点位_2", "宣传点位_3","ATM点位_4","仓库点位_5","其他点位_6"}) | replace = {"商铺_null", "固定点位_1", "临时促销点位_2", "宣传点位_3","ATM点位_4","仓库点位_5","其他点位_6"}) | ||||
| @io.swagger.annotations.ApiModelProperty(value = "点位类型", name = "pointType") | |||||
| private Integer pointType; | private Integer pointType; | ||||
| /*商铺编号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") | |||||
| @Excel(name="商铺号/多径点位号",width = 20,orderNum = "2") | @Excel(name="商铺号/多径点位号",width = 20,orderNum = "2") | ||||
| @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") | |||||
| private String shopNumber; | private String shopNumber; | ||||
| /*建筑面积**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="建筑面积",name="buildArea") | |||||
| @Excel(name="建筑面积(㎡)",width = 20,orderNum = "5") | @Excel(name="建筑面积(㎡)",width = 20,orderNum = "5") | ||||
| @SortColumn(column = "buildArea") | @SortColumn(column = "buildArea") | ||||
| @io.swagger.annotations.ApiModelProperty(value="建筑面积",name="buildArea") | |||||
| private String buildArea; | private String buildArea; | ||||
| /*经营面积**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="经营面积",name="operationArea") | |||||
| @Excel(name="计租面积(㎡)",width = 20,orderNum = "6") | @Excel(name="计租面积(㎡)",width = 20,orderNum = "6") | ||||
| @SortColumn(column = "operationArea") | @SortColumn(column = "operationArea") | ||||
| @io.swagger.annotations.ApiModelProperty(value="经营面积",name="operationArea") | |||||
| private String operationArea; | private String operationArea; | ||||
| /*楼座号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") | ||||
| private Long building; | private Long building; | ||||
| /*楼层号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") | ||||
| private Long floor; | private Long floor; | ||||
| /*状态(0:未出租, 1:已出租)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="状态(0:未出租, 1:已出租)",name="status") | |||||
| @Excel(name="租赁状态",width = 20,orderNum = "7",replace = {"未出租_0","已出租_1"}) | @Excel(name="租赁状态",width = 20,orderNum = "7",replace = {"未出租_0","已出租_1"}) | ||||
| @io.swagger.annotations.ApiModelProperty(value="状态(0:未出租, 1:已出租)",name="status") | |||||
| private Integer status; | private Integer status; | ||||
| /*店铺相对位置x**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="店铺相对位置x",name="x") | @io.swagger.annotations.ApiModelProperty(value="店铺相对位置x",name="x") | ||||
| private BigDecimal x; | private BigDecimal x; | ||||
| /*店铺相对位置y**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="店铺相对位置y",name="y") | @io.swagger.annotations.ApiModelProperty(value="店铺相对位置y",name="y") | ||||
| private BigDecimal y; | private BigDecimal y; | ||||
| /*地址**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") | @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") | ||||
| private String addr; | private String addr; | ||||
| /*百度poi(省市区县street等)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="百度poi(省市区县street等)",name="baiduPoi") | @io.swagger.annotations.ApiModelProperty(value="百度poi(省市区县street等)",name="baiduPoi") | ||||
| private String baiduPoi; | private String baiduPoi; | ||||
| /*经度- baidu poi**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="经度- baidu poi",name="longitude") | @io.swagger.annotations.ApiModelProperty(value="经度- baidu poi",name="longitude") | ||||
| private BigDecimal longitude; | private BigDecimal longitude; | ||||
| /*维度-baidu poi**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="维度-baidu poi",name="latitude") | @io.swagger.annotations.ApiModelProperty(value="维度-baidu poi",name="latitude") | ||||
| private BigDecimal latitude; | private BigDecimal latitude; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @@ -124,212 +117,19 @@ public class WxShop extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = " ") | @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = " ") | ||||
| private Integer isDel; | private Integer isDel; | ||||
| //开始时间 | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value = "查询-开始时间", name = "startdate") | |||||
| private Date startdate; | private Date startdate; | ||||
| //结束时间 | |||||
| @Transient | @Transient | ||||
| @io.swagger.annotations.ApiModelProperty(value = "查询-结束时间", name = "startdate") | |||||
| private Date enddate; | private Date enddate; | ||||
| //闲置时间 | |||||
| @io.swagger.annotations.ApiModelProperty(value = "闲置时间", name = "freeDay") | |||||
| @Transient | @Transient | ||||
| @SortColumn(column = "freeDay") | @SortColumn(column = "freeDay") | ||||
| @io.swagger.annotations.ApiModelProperty(value = "闲置时间", name = "freeDay") | |||||
| private Integer freeDay; | private Integer freeDay; | ||||
| public Integer getFreeDay() { | |||||
| return freeDay; | |||||
| } | |||||
| public void setFreeDay(Integer freeDay) { | |||||
| this.freeDay = freeDay; | |||||
| } | |||||
| public Integer getIsDel() { | |||||
| return isDel; | |||||
| } | |||||
| public void setIsDel(Integer isDel) { | |||||
| this.isDel = isDel; | |||||
| } | |||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getShopNumber() { | |||||
| return shopNumber; | |||||
| } | |||||
| public void setShopNumber(String _shopNumber) { | |||||
| shopNumber = _shopNumber; | |||||
| } | |||||
| public String getBuildArea() { | |||||
| return buildArea; | |||||
| } | |||||
| public void setBuildArea(String _buildArea) { | |||||
| buildArea = _buildArea; | |||||
| } | |||||
| public String getOperationArea() { | |||||
| return operationArea; | |||||
| } | |||||
| public void setOperationArea(String _operationArea) { | |||||
| operationArea = _operationArea; | |||||
| } | |||||
| public Long getBuilding() { | |||||
| return building; | |||||
| } | |||||
| public void setBuilding(Long _building) { | |||||
| building = _building; | |||||
| } | |||||
| public Long getFloor() { | |||||
| return floor; | |||||
| } | |||||
| public void setFloor(Long _floor) { | |||||
| floor = _floor; | |||||
| } | |||||
| public Integer getStatus() { | |||||
| return status; | |||||
| } | |||||
| public void setStatus(Integer _status) { | |||||
| status = _status; | |||||
| } | |||||
| public BigDecimal getX() { | |||||
| return x; | |||||
| } | |||||
| public void setX(BigDecimal _x) { | |||||
| x = _x; | |||||
| } | |||||
| public BigDecimal getY() { | |||||
| return y; | |||||
| } | |||||
| public void setY(BigDecimal _y) { | |||||
| y = _y; | |||||
| } | |||||
| public String getAddr() { | |||||
| return addr; | |||||
| } | |||||
| public void setAddr(String _addr) { | |||||
| addr = _addr; | |||||
| } | |||||
| public String getBaiduPoi() { | |||||
| return baiduPoi; | |||||
| } | |||||
| public void setBaiduPoi(String _baiduPoi) { | |||||
| baiduPoi = _baiduPoi; | |||||
| } | |||||
| public BigDecimal getLongitude() { | |||||
| return longitude; | |||||
| } | |||||
| public void setLongitude(BigDecimal _longitude) { | |||||
| longitude = _longitude; | |||||
| } | |||||
| public BigDecimal getLatitude() { | |||||
| return latitude; | |||||
| } | |||||
| public void setLatitude(BigDecimal _latitude) { | |||||
| latitude = _latitude; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public Date getStartdate() { | |||||
| return startdate; | |||||
| } | |||||
| public void setStartdate(Date startdate) { | |||||
| this.startdate = startdate; | |||||
| } | |||||
| public Date getEnddate() { | |||||
| return enddate; | |||||
| } | |||||
| public void setEnddate(Date enddate) { | |||||
| this.enddate = enddate; | |||||
| } | |||||
| public String getImgUrl() { | |||||
| return imgUrl; | |||||
| } | |||||
| public void setImgUrl(String imgUrl) { | |||||
| this.imgUrl = imgUrl; | |||||
| } | |||||
| public Long getRentContractId() { | |||||
| return rentContractId; | |||||
| } | |||||
| public void setRentContractId(Long rentContractId) { | |||||
| this.rentContractId = rentContractId; | |||||
| } | |||||
| public String getLinkPerson() { | |||||
| return linkPerson; | |||||
| } | |||||
| public void setLinkPerson(String linkPerson) { | |||||
| this.linkPerson = linkPerson; | |||||
| } | |||||
| public String getLinkPhone() { | |||||
| return linkPhone; | |||||
| } | |||||
| public void setLinkPhone(String linkPhone) { | |||||
| this.linkPhone = linkPhone; | |||||
| } | |||||
| public String getManager() { | |||||
| return manager; | |||||
| } | |||||
| public void setManager(String manager) { | |||||
| this.manager = manager; | |||||
| } | |||||
| public String getManagerPhone() { | |||||
| return managerPhone; | |||||
| } | |||||
| public void setManagerPhone(String managerPhone) { | |||||
| this.managerPhone = managerPhone; | |||||
| } | |||||
| public Integer getType() { | |||||
| return type; | |||||
| } | |||||
| public void setType(Integer type) { | |||||
| this.type = type; | |||||
| } | |||||
| public Integer getPointType() { | |||||
| return pointType; | |||||
| } | |||||
| public void setPointType(Integer pointType) { | |||||
| this.pointType = pointType; | |||||
| } | |||||
| public String getComments() { | |||||
| return comments; | |||||
| } | |||||
| public void setComments(String comments) { | |||||
| this.comments = comments; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_sub_business") | @Table(name = "wx_sub_business") | ||||
| @Data | |||||
| public class WxSubBusiness implements Serializable { | public class WxSubBusiness implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,85 +22,22 @@ public class WxSubBusiness implements Serializable { | |||||
| protected List<String> ids; | protected List<String> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Integer getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Integer id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<String> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<String> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /*子业态名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="子业态名",name="title") | @io.swagger.annotations.ApiModelProperty(value="子业态名",name="title") | ||||
| private String title; | private String title; | ||||
| /*业态ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="业态ID",name="businessId") | @io.swagger.annotations.ApiModelProperty(value="业态ID",name="businessId") | ||||
| private Integer businessId; | private Integer businessId; | ||||
| /*业态名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="业态名",name="businessTitle") | @io.swagger.annotations.ApiModelProperty(value="业态名",name="businessTitle") | ||||
| private String businessTitle; | private String businessTitle; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| public String getTitle() { | |||||
| return title; | |||||
| } | |||||
| public void setTitle(String _title) { | |||||
| title = _title; | |||||
| } | |||||
| public Integer getBusinessId() { | |||||
| return businessId; | |||||
| } | |||||
| public void setBusinessId(Integer businessId) { | |||||
| this.businessId = businessId; | |||||
| } | |||||
| public String getBusinessTitle() { | |||||
| return businessTitle; | |||||
| } | |||||
| public void setBusinessTitle(String businessTitle) { | |||||
| this.businessTitle = businessTitle; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public Date getUpdateDate() { | |||||
| return updateDate; | |||||
| } | |||||
| public void setUpdateDate(Date _updateDate) { | |||||
| updateDate = _updateDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| @@ -30,59 +30,41 @@ public class WxSubsidy extends BaseEntity { | |||||
| return super.getSortColumns(); | return super.getSortColumns(); | ||||
| } | } | ||||
| /**租户ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**操作用户ID*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="操作用户ID",name="operatorUserId") | @io.swagger.annotations.ApiModelProperty(value="操作用户ID",name="operatorUserId") | ||||
| private Long operatorUserId; | private Long operatorUserId; | ||||
| /**创建时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") | ||||
| private Date createTime; | private Date createTime; | ||||
| /**更新时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateTime") | ||||
| private Date updateTime; | private Date updateTime; | ||||
| /**微信商户订单号/商品ID,同ID一致*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="微信商户订单号/商品ID,同ID一致",name="orderNo") | @io.swagger.annotations.ApiModelProperty(value="微信商户订单号/商品ID,同ID一致",name="orderNo") | ||||
| private String orderNo; | private String orderNo; | ||||
| /**商品描述*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商品描述",name="body") | @io.swagger.annotations.ApiModelProperty(value="商品描述",name="body") | ||||
| private String body; | private String body; | ||||
| /**终端IP*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="终端IP",name="ip") | @io.swagger.annotations.ApiModelProperty(value="终端IP",name="ip") | ||||
| private String ip; | private String ip; | ||||
| /**支付状态: 0-支付中;1-支付成功;2-支付失败*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="status") | @io.swagger.annotations.ApiModelProperty(value="支付状态: 0-支付中;1-支付成功;2-支付失败",name="status") | ||||
| private Integer status; | private Integer status; | ||||
| /**支付发起时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") | @io.swagger.annotations.ApiModelProperty(value="支付发起时间",name="payTimeStart") | ||||
| private Date payTimeStart; | private Date payTimeStart; | ||||
| /**支付结束时间*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") | @io.swagger.annotations.ApiModelProperty(value="支付结束时间",name="payTimeEnd") | ||||
| private Date payTimeEnd; | private Date payTimeEnd; | ||||
| /**预支付交易会话标识*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="预支付交易会话标识",name="prepayId") | @io.swagger.annotations.ApiModelProperty(value="预支付交易会话标识",name="prepayId") | ||||
| private String prepayId; | private String prepayId; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="codeUrl") | @io.swagger.annotations.ApiModelProperty(value="",name="codeUrl") | ||||
| private String codeUrl; | private String codeUrl; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="transactionId") | @io.swagger.annotations.ApiModelProperty(value="",name="transactionId") | ||||
| private String transactionId; | private String transactionId; | ||||
| /**总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="总金额",name="amount") | @io.swagger.annotations.ApiModelProperty(value="总金额",name="amount") | ||||
| private Integer amount; | private Integer amount; | ||||
| /**可分账总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="可分账总金额",name="shareAmount") | @io.swagger.annotations.ApiModelProperty(value="可分账总金额",name="shareAmount") | ||||
| private Integer shareAmount; | private Integer shareAmount; | ||||
| /**可分账剩余总金额*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="可分账剩余总金额",name="shareRemainAmount") | @io.swagger.annotations.ApiModelProperty(value="可分账剩余总金额",name="shareRemainAmount") | ||||
| private Integer shareRemainAmount; | private Integer shareRemainAmount; | ||||
| /**支付失败原因*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") | @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="failReason") | ||||
| private String failReason; | private String failReason; | ||||
| /**支付者openId*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付失败原因",name="openId") | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付者openId",name="openId") | |||||
| private String openId; | private String openId; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_tags") | @Table(name = "wx_tags") | ||||
| @Data | |||||
| public class WxTags implements Serializable { | public class WxTags implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,90 +21,20 @@ public class WxTags implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | ||||
| private String name; | private String name; | ||||
| /**1基础2生活属性3消费偏好4行为偏好**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupId") | @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupId") | ||||
| private Long groupId; | private Long groupId; | ||||
| /**二级属性 性别等**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="typeId") | @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="typeId") | ||||
| private Long typeId; | private Long typeId; | ||||
| /**1基础2生活属性3消费偏好4行为偏好**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupName") | @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupName") | ||||
| private String groupName; | private String groupName; | ||||
| /**二级属性 性别等**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="typeName") | @io.swagger.annotations.ApiModelProperty(value="二级属性 性别等",name="typeName") | ||||
| private String typeName; | private String typeName; | ||||
| @Transient | @Transient | ||||
| protected Long count; | protected Long count; | ||||
| public Long getCount() { | |||||
| return count; | |||||
| } | |||||
| public void setCount(Long count) { | |||||
| this.count = count; | |||||
| } | |||||
| public String getName() { | |||||
| return name; | |||||
| } | |||||
| public void setName(String _name) { | |||||
| name = _name; | |||||
| } | |||||
| public Long getGroupId() { | |||||
| return groupId; | |||||
| } | |||||
| public void setGroupId(Long groupId) { | |||||
| this.groupId = groupId; | |||||
| } | |||||
| public Long getTypeId() { | |||||
| return typeId; | |||||
| } | |||||
| public void setTypeId(Long typeId) { | |||||
| this.typeId = typeId; | |||||
| } | |||||
| public String getGroupName() { | |||||
| return groupName; | |||||
| } | |||||
| public void setGroupName(String groupName) { | |||||
| this.groupName = groupName; | |||||
| } | |||||
| public String getTypeName() { | |||||
| return typeName; | |||||
| } | |||||
| public void setTypeName(String typeName) { | |||||
| this.typeName = typeName; | |||||
| } | |||||
| public enum Field | public enum Field | ||||
| { | { | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_tags_group") | @Table(name = "wx_tags_group") | ||||
| @Data | |||||
| public class WxTagsGroup implements Serializable { | public class WxTagsGroup implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -20,35 +23,6 @@ public class WxTagsGroup implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| public String getName() { | |||||
| return name; | |||||
| } | |||||
| public void setName(String name) { | |||||
| this.name = name; | |||||
| } | |||||
| /**名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | ||||
| private String name; | private String name; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import java.util.ArrayList; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_tags_type") | @Table(name = "wx_tags_type") | ||||
| @Data | |||||
| public class WxTagsType implements Serializable { | public class WxTagsType implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -19,75 +22,19 @@ public class WxTagsType implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | @io.swagger.annotations.ApiModelProperty(value="名称",name="name") | ||||
| private String name; | private String name; | ||||
| /**1基础2生活属性3消费偏好4行为偏好**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupId") | @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupId") | ||||
| private Long groupId; | private Long groupId; | ||||
| /**1基础2生活属性3消费偏好4行为偏好**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupName") | @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupName") | ||||
| private String groupName; | private String groupName; | ||||
| /**名称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="标志",name="flag") | @io.swagger.annotations.ApiModelProperty(value="标志",name="flag") | ||||
| private Integer flag; | private Integer flag; | ||||
| public Integer getFlag() { | |||||
| return flag; | |||||
| } | |||||
| public void setFlag(Integer flag) { | |||||
| this.flag = flag; | |||||
| } | |||||
| public Long getGroupId() { | |||||
| return groupId; | |||||
| } | |||||
| public void setGroupId(Long groupId) { | |||||
| this.groupId = groupId; | |||||
| } | |||||
| public String getGroupName() { | |||||
| return groupName; | |||||
| } | |||||
| public void setGroupName(String groupName) { | |||||
| this.groupName = groupName; | |||||
| } | |||||
| public String getName() { | |||||
| return name; | |||||
| } | |||||
| public void setName(String name) { | |||||
| this.name = name; | |||||
| } | |||||
| public enum Field | public enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -14,7 +14,7 @@ import java.util.List; | |||||
| @Data | @Data | ||||
| @ToString(callSuper = true) | @ToString(callSuper = true) | ||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxTopic extends BaseEntity{ | |||||
| public class WxTopic extends BaseEntity { | |||||
| @Id | @Id | ||||
| protected Long id; | protected Long id; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| import java.util.List; | import java.util.List; | ||||
| @@ -7,6 +9,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_user_channel") | @Table(name = "wx_user_channel") | ||||
| @Data | |||||
| public class WxUserChannel implements Serializable { | public class WxUserChannel implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -17,73 +20,23 @@ public class WxUserChannel implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="channelName") | @io.swagger.annotations.ApiModelProperty(value="",name="channelName") | ||||
| private String channelName; | private String channelName; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="sceneAddress") | @io.swagger.annotations.ApiModelProperty(value="",name="sceneAddress") | ||||
| private String sceneAddress; | private String sceneAddress; | ||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="description") | @io.swagger.annotations.ApiModelProperty(value="",name="description") | ||||
| private String description; | private String description; | ||||
| public String getChannelName() { | |||||
| return channelName; | |||||
| } | |||||
| public void setChannelName(String _channelName) { | |||||
| channelName = _channelName; | |||||
| } | |||||
| public String getSceneAddress() { | |||||
| return sceneAddress; | |||||
| } | |||||
| public void setSceneAddress(String _sceneAddress) { | |||||
| sceneAddress = _sceneAddress; | |||||
| } | |||||
| public String getDescription() { | |||||
| return description; | |||||
| } | |||||
| public void setDescription(String _description) { | |||||
| description = _description; | |||||
| } | |||||
| @Transient | @Transient | ||||
| protected long count; | protected long count; | ||||
| public long getCount() { | |||||
| return count; | |||||
| } | |||||
| public void setCount(long count) { | |||||
| this.count = count; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,ChannelName_ASC("`channelName` ASC"),ChannelName_DESC("`channelName` DESC") | |||||
| ,SceneAddress_ASC("`sceneAddress` ASC"),SceneAddress_DESC("`sceneAddress` DESC") | |||||
| ,ChannelName_ASC("`channel_name` ASC"),ChannelName_DESC("`channel_name` DESC") | |||||
| ,SceneAddress_ASC("`scene_address` ASC"),SceneAddress_DESC("`scene_address` DESC") | |||||
| ,Description_ASC("`description` ASC"),Description_DESC("`description` DESC") | ,Description_ASC("`description` ASC"),Description_DESC("`description` DESC") | ||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.*; | import javax.persistence.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -8,6 +10,7 @@ import javax.persistence.Id; | |||||
| import java.io.Serializable; | import java.io.Serializable; | ||||
| @Table(name = "wx_user_visit") | @Table(name = "wx_user_visit") | ||||
| @Data | |||||
| public class WxUserVisit implements Serializable { | public class WxUserVisit implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -18,155 +21,48 @@ public class WxUserVisit implements Serializable { | |||||
| protected List<Long> ids; | protected List<Long> ids; | ||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /***/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||||
| private String tenantId; | private String tenantId; | ||||
| /*日期字符串**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="日期字符串",name="refDate") | @io.swagger.annotations.ApiModelProperty(value="日期字符串",name="refDate") | ||||
| private String refDate; | private String refDate; | ||||
| /*日期**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="日期",name="dayDate") | @io.swagger.annotations.ApiModelProperty(value="日期",name="dayDate") | ||||
| private Date dayDate; | private Date dayDate; | ||||
| /*打开次数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="打开次数",name="sessionCnt") | @io.swagger.annotations.ApiModelProperty(value="打开次数",name="sessionCnt") | ||||
| private Integer sessionCnt; | private Integer sessionCnt; | ||||
| /*访问次数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="访问次数",name="visitPv") | @io.swagger.annotations.ApiModelProperty(value="访问次数",name="visitPv") | ||||
| private Integer visitPv; | private Integer visitPv; | ||||
| /*访问人数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="访问人数",name="visitUv") | @io.swagger.annotations.ApiModelProperty(value="访问人数",name="visitUv") | ||||
| private Integer visitUv; | private Integer visitUv; | ||||
| /*新用户数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="新用户数",name="visitUvNew") | @io.swagger.annotations.ApiModelProperty(value="新用户数",name="visitUvNew") | ||||
| private Integer visitUvNew; | private Integer visitUvNew; | ||||
| /*人均停留时长 (浮点型,单位:秒)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="人均停留时长 (浮点型,单位:秒)",name="stayTimeUv") | @io.swagger.annotations.ApiModelProperty(value="人均停留时长 (浮点型,单位:秒)",name="stayTimeUv") | ||||
| private String stayTimeUv; | private String stayTimeUv; | ||||
| /*次均停留时长 (浮点型,单位:秒)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="次均停留时长 (浮点型,单位:秒)",name="stayTimeSession") | @io.swagger.annotations.ApiModelProperty(value="次均停留时长 (浮点型,单位:秒)",name="stayTimeSession") | ||||
| private String stayTimeSession; | private String stayTimeSession; | ||||
| /*平均访问深度 (浮点型)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="平均访问深度 (浮点型)",name="visitDepth") | @io.swagger.annotations.ApiModelProperty(value="平均访问深度 (浮点型)",name="visitDepth") | ||||
| private String visitDepth; | private String visitDepth; | ||||
| /*appId**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="appId",name="appId") | @io.swagger.annotations.ApiModelProperty(value="appId",name="appId") | ||||
| private String appId; | private String appId; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getRefDate() { | |||||
| return refDate; | |||||
| } | |||||
| public void setRefDate(String _refDate) { | |||||
| refDate = _refDate; | |||||
| } | |||||
| public Date getDayDate() { | |||||
| return dayDate; | |||||
| } | |||||
| public void setDayDate(Date _dayDate) { | |||||
| dayDate = _dayDate; | |||||
| } | |||||
| public Integer getSessionCnt() { | |||||
| return sessionCnt; | |||||
| } | |||||
| public void setSessionCnt(Integer _sessionCnt) { | |||||
| sessionCnt = _sessionCnt; | |||||
| } | |||||
| public Integer getVisitPv() { | |||||
| return visitPv; | |||||
| } | |||||
| public void setVisitPv(Integer _visitPv) { | |||||
| visitPv = _visitPv; | |||||
| } | |||||
| public Integer getVisitUv() { | |||||
| return visitUv; | |||||
| } | |||||
| public void setVisitUv(Integer _visitUv) { | |||||
| visitUv = _visitUv; | |||||
| } | |||||
| public Integer getVisitUvNew() { | |||||
| return visitUvNew; | |||||
| } | |||||
| public void setVisitUvNew(Integer _visitUvNew) { | |||||
| visitUvNew = _visitUvNew; | |||||
| } | |||||
| public String getStayTimeUv() { | |||||
| return stayTimeUv; | |||||
| } | |||||
| public void setStayTimeUv(String _stayTimeUv) { | |||||
| stayTimeUv = _stayTimeUv; | |||||
| } | |||||
| public String getStayTimeSession() { | |||||
| return stayTimeSession; | |||||
| } | |||||
| public void setStayTimeSession(String _stayTimeSession) { | |||||
| stayTimeSession = _stayTimeSession; | |||||
| } | |||||
| public String getVisitDepth() { | |||||
| return visitDepth; | |||||
| } | |||||
| public void setVisitDepth(String _visitDepth) { | |||||
| visitDepth = _visitDepth; | |||||
| } | |||||
| public String getAppId() { | |||||
| return appId; | |||||
| } | |||||
| public void setAppId(String _appId) { | |||||
| appId = _appId; | |||||
| } | |||||
| public Date getCreateDate() { | |||||
| return createDate; | |||||
| } | |||||
| public void setCreateDate(Date _createDate) { | |||||
| createDate = _createDate; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") | |||||
| ,RefDate_ASC("`refDate` ASC"),RefDate_DESC("`refDate` DESC") | |||||
| ,DayDate_ASC("`dayDate` ASC"),DayDate_DESC("`dayDate` DESC") | |||||
| ,SessionCnt_ASC("`sessionCnt` ASC"),SessionCnt_DESC("`sessionCnt` DESC") | |||||
| ,VisitPv_ASC("`visitPv` ASC"),VisitPv_DESC("`visitPv` DESC") | |||||
| ,VisitUv_ASC("`visitUv` ASC"),VisitUv_DESC("`visitUv` DESC") | |||||
| ,VisitUvNew_ASC("`visitUvNew` ASC"),VisitUvNew_DESC("`visitUvNew` DESC") | |||||
| ,StayTimeUv_ASC("`stayTimeUv` ASC"),StayTimeUv_DESC("`stayTimeUv` DESC") | |||||
| ,StayTimeSession_ASC("`stayTimeSession` ASC"),StayTimeSession_DESC("`stayTimeSession` DESC") | |||||
| ,VisitDepth_ASC("`visitDepth` ASC"),VisitDepth_DESC("`visitDepth` DESC") | |||||
| ,AppId_ASC("`appId` ASC"),AppId_DESC("`appId` DESC") | |||||
| ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") | |||||
| ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") | |||||
| ,RefDate_ASC("`ref_date` ASC"),RefDate_DESC("`ref_date` DESC") | |||||
| ,DayDate_ASC("`day_date` ASC"),DayDate_DESC("`day_date` DESC") | |||||
| ,SessionCnt_ASC("`session_cnt` ASC"),SessionCnt_DESC("`session_cnt` DESC") | |||||
| ,VisitPv_ASC("`visit_pv` ASC"),VisitPv_DESC("`visit_pv` DESC") | |||||
| ,VisitUv_ASC("`visit_uv` ASC"),VisitUv_DESC("`visit_uv` DESC") | |||||
| ,VisitUvNew_ASC("`visit_uv_new` ASC"),VisitUvNew_DESC("`visit_uv_new` DESC") | |||||
| ,StayTimeUv_ASC("`stay_time_uv` ASC"),StayTimeUv_DESC("`stay_time_uv` DESC") | |||||
| ,StayTimeSession_ASC("`stay_time_session` ASC"),StayTimeSession_DESC("`stay_time_session` DESC") | |||||
| ,VisitDepth_ASC("`visit_depth` ASC"),VisitDepth_DESC("`visit_depth` DESC") | |||||
| ,AppId_ASC("`app_id` ASC"),AppId_DESC("`app_id` DESC") | |||||
| ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") | |||||
| ; | ; | ||||
| private String value; | private String value; | ||||
| Field(String value){ | Field(String value){ | ||||
| @@ -1,5 +1,7 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import lombok.Data; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| import javax.persistence.Table; | import javax.persistence.Table; | ||||
| import javax.persistence.Transient; | import javax.persistence.Transient; | ||||
| @@ -9,6 +11,7 @@ import java.util.Date; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Table(name = "wx_wiwide_info") | @Table(name = "wx_wiwide_info") | ||||
| @Data | |||||
| public class WxWiWideInfo implements Serializable { | public class WxWiWideInfo implements Serializable { | ||||
| private static final long serialVersionUID = 1L; | private static final long serialVersionUID = 1L; | ||||
| @@ -20,30 +23,9 @@ public class WxWiWideInfo implements Serializable { | |||||
| @Transient | @Transient | ||||
| protected String sortColumns; | protected String sortColumns; | ||||
| public Long getId() { | |||||
| return id; | |||||
| } | |||||
| public void setId(Long id) { | |||||
| this.id = id; | |||||
| } | |||||
| public String getSortColumns() { | |||||
| return sortColumns; | |||||
| } | |||||
| public List<Long> getIds() { | |||||
| return ids; | |||||
| } | |||||
| public void setIds(List<Long> ids) { | |||||
| this.ids = ids; | |||||
| } | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /**迈外迪id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="迈外迪id",name="wiwideId") | @io.swagger.annotations.ApiModelProperty(value="迈外迪id",name="wiwideId") | ||||
| private String wiwideId; | private String wiwideId; | ||||
| @@ -59,63 +41,9 @@ public class WxWiWideInfo implements Serializable { | |||||
| @io.swagger.annotations.ApiModelProperty(value="expiredTime",name="expiredTime") | @io.swagger.annotations.ApiModelProperty(value="expiredTime",name="expiredTime") | ||||
| private Date expiredTime; | private Date expiredTime; | ||||
| /*卖外迪信息类型列表,1,支持客流 2,支持wifi*/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="capability",name="capability") | |||||
| @io.swagger.annotations.ApiModelProperty(value="迈外迪信息类型列表,1,支持客流 2,支持wifi",name="capability") | |||||
| private String capability; | private String capability; | ||||
| public String getTenantId() { | |||||
| return tenantId; | |||||
| } | |||||
| public void setTenantId(String _tenantId) { | |||||
| tenantId = _tenantId; | |||||
| } | |||||
| public String getWiwideId() { | |||||
| return wiwideId; | |||||
| } | |||||
| public void setWiwideId(String _wiwideId) { | |||||
| wiwideId = _wiwideId; | |||||
| } | |||||
| public String getWiwideKey() { | |||||
| return wiwideKey; | |||||
| } | |||||
| public void setWiwideKey(String wiwideKey) { | |||||
| this.wiwideKey = wiwideKey; | |||||
| } | |||||
| public String getWiwideUrl() { | |||||
| return wiwideUrl; | |||||
| } | |||||
| public void setWiwideUrl(String wiwideUrl) { | |||||
| this.wiwideUrl = wiwideUrl; | |||||
| } | |||||
| public String getToken() { | |||||
| return token; | |||||
| } | |||||
| public void setToken(String token) { | |||||
| this.token = token; | |||||
| } | |||||
| public Date getExpiredTime() { | |||||
| return expiredTime; | |||||
| } | |||||
| public void setExpiredTime(Date expiredTime) { | |||||
| this.expiredTime = expiredTime; | |||||
| } | |||||
| public String getCapability() { | |||||
| return capability; | |||||
| } | |||||
| public void setCapability(String capability) { | |||||
| this.capability = capability; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||
| @@ -1,27 +1,14 @@ | |||||
| package com.iformall.domain.vo; | package com.iformall.domain.vo; | ||||
| import lombok.Data; | |||||
| /** | /** | ||||
| * Created by syf on 2018/8/30. | * Created by syf on 2018/8/30. | ||||
| */ | */ | ||||
| @Data | |||||
| public class CUserDateAmountVo { | public class CUserDateAmountVo { | ||||
| private String xTime; | private String xTime; | ||||
| private int price; | private int price; | ||||
| public String getxTime() { | |||||
| return xTime; | |||||
| } | |||||
| public void setxTime(String xTime) { | |||||
| this.xTime = xTime; | |||||
| } | |||||
| public int getPrice() { | |||||
| return price; | |||||
| } | |||||
| public void setPrice(int price) { | |||||
| this.price = price; | |||||
| } | |||||
| } | } | ||||
| @@ -1,81 +1,41 @@ | |||||
| package com.iformall.domain.vo; | package com.iformall.domain.vo; | ||||
| import com.iformall.domain.po.WxOrder; | import com.iformall.domain.po.WxOrder; | ||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import lombok.ToString; | |||||
| import java.util.List; | import java.util.List; | ||||
| @Data | |||||
| @ToString(callSuper = true) | |||||
| @EqualsAndHashCode(callSuper = true) | |||||
| public class WxOrderPayVo extends WxOrder { | public class WxOrderPayVo extends WxOrder { | ||||
| /**发券商户信息*/ | /**发券商户信息*/ | ||||
| /**商户名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") | @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") | ||||
| private String merchantName; | private String merchantName; | ||||
| /**b端用户姓名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") | @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") | ||||
| private String bUserName; | private String bUserName; | ||||
| /**b端用户手机号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") | @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") | ||||
| private String bUserPhone; | private String bUserPhone; | ||||
| /**c用户绑定的手机号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") | |||||
| @io.swagger.annotations.ApiModelProperty(value="c用户绑定的手机号",name="cUserPhone") | |||||
| private String cUserPhone; | private String cUserPhone; | ||||
| /**c用户昵称**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="c用户昵称",name="nickName") | @io.swagger.annotations.ApiModelProperty(value="c用户昵称",name="nickName") | ||||
| private String nickName; | private String nickName; | ||||
| /**c用户名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="c用户名",name="cUserName") | @io.swagger.annotations.ApiModelProperty(value="c用户名",name="cUserName") | ||||
| private String cUserName; | private String cUserName; | ||||
| public String getMerchantName() { | |||||
| return merchantName; | |||||
| } | |||||
| public void setMerchantName(String merchantName) { | |||||
| this.merchantName = merchantName; | |||||
| } | |||||
| public String getbUserName() { | |||||
| return bUserName; | |||||
| } | |||||
| public void setbUserName(String bUserName) { | |||||
| this.bUserName = bUserName; | |||||
| } | |||||
| public String getbUserPhone() { | |||||
| return bUserPhone; | |||||
| } | |||||
| public void setbUserPhone(String bUserPhone) { | |||||
| this.bUserPhone = bUserPhone; | |||||
| } | |||||
| public String getcUserPhone() { | |||||
| return cUserPhone; | |||||
| } | |||||
| public void setcUserPhone(String cUserPhone) { | |||||
| this.cUserPhone = cUserPhone; | |||||
| } | |||||
| public String getNickName() { | |||||
| return nickName; | |||||
| } | |||||
| public void setNickName(String nickName) { | |||||
| this.nickName = nickName; | |||||
| } | |||||
| @Override | @Override | ||||
| public String getcUserName() { | |||||
| public String getCUserName() { | |||||
| return cUserName; | return cUserName; | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void setcUserName(String cUserName) { | |||||
| public void setCUserName(String cUserName) { | |||||
| this.cUserName = cUserName; | this.cUserName = cUserName; | ||||
| } | } | ||||
| @@ -71,7 +71,7 @@ public class WxCUserFromBServiceImpl implements WxCUserFromBService { | |||||
| @Override | @Override | ||||
| public PageInfo<WxCUserFromB> listCUser(WxCUserFromBDto wxCUserFromBDto, Integer pageIndex, Integer pageSize) { | public PageInfo<WxCUserFromB> listCUser(WxCUserFromBDto wxCUserFromBDto, Integer pageIndex, Integer pageSize) { | ||||
| WxCUserFromB record = new WxCUserFromB(); | WxCUserFromB record = new WxCUserFromB(); | ||||
| record.setbUserId(wxCUserFromBDto.getBUserId()); | |||||
| record.setBUserId(wxCUserFromBDto.getBUserId()); | |||||
| return PageHelper.startPage(pageIndex, pageSize) | return PageHelper.startPage(pageIndex, pageSize) | ||||
| .doSelectPageInfo(() -> wxCUserFromBMapper.findList(record)); | .doSelectPageInfo(() -> wxCUserFromBMapper.findList(record)); | ||||
| } | } | ||||
| @@ -1139,7 +1139,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); | List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); | ||||
| Map<String, Integer> dataMap = new HashMap<>(); | Map<String, Integer> dataMap = new HashMap<>(); | ||||
| for (CUserDateAmountVo v : datas) { | for (CUserDateAmountVo v : datas) { | ||||
| dataMap.put(v.getxTime(), v.getPrice()); | |||||
| dataMap.put(v.getXTime(), v.getPrice()); | |||||
| } | } | ||||
| List<UserStructureVo> weekVos = new ArrayList<>();//周消费金额 | List<UserStructureVo> weekVos = new ArrayList<>();//周消费金额 | ||||
| for (int i = 7, sortNum = 0; i >= 0; i--) { | for (int i = 7, sortNum = 0; i >= 0; i--) { | ||||
| @@ -1181,7 +1181,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| List<UserStructureVo> monthVos = new ArrayList<>();//周消费金额 | List<UserStructureVo> monthVos = new ArrayList<>();//周消费金额 | ||||
| Map<String, Integer> dataMap = new HashMap<>(); | Map<String, Integer> dataMap = new HashMap<>(); | ||||
| for (CUserDateAmountVo v : datas) { | for (CUserDateAmountVo v : datas) { | ||||
| dataMap.put(v.getxTime(), v.getPrice()); | |||||
| dataMap.put(v.getXTime(), v.getPrice()); | |||||
| } | } | ||||
| for (int i = 29, sortNum = 0; i >= 0; i--) { | for (int i = 29, sortNum = 0; i >= 0; i--) { | ||||
| c.clear(); | c.clear(); | ||||
| @@ -1318,7 +1318,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); | List<CUserDateAmountVo> datas = wxCouponOrderMapper.queryPriceTotalGroup(tenantId, sTime, eTime); | ||||
| Map<String, Integer> dataMap = new HashMap<>(); | Map<String, Integer> dataMap = new HashMap<>(); | ||||
| for (CUserDateAmountVo v : datas) { | for (CUserDateAmountVo v : datas) { | ||||
| dataMap.put(v.getxTime(), v.getPrice()); | |||||
| dataMap.put(v.getXTime(), v.getPrice()); | |||||
| } | } | ||||
| List<UserStructureVo> monthVos = new ArrayList<>(); | List<UserStructureVo> monthVos = new ArrayList<>(); | ||||
| for (int i = 29, sortNum = 0; i >= 0; i--) { | for (int i = 29, sortNum = 0; i >= 0; i--) { | ||||
| @@ -378,7 +378,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); | wxPayOrder = wxPayOrderMapper.selectOne(wxPayOrder); | ||||
| if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { | if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { | ||||
| WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); | WxSharingOrderDto wxSharingOrderDto = new WxSharingOrderDto(); | ||||
| wxSharingOrderDto.setCUserId(wxPayOrder.getcUserId()); | |||||
| wxSharingOrderDto.setCUserId(wxPayOrder.getCUserId()); | |||||
| wxSharingOrderDto.setMerchantId(merchantId); | wxSharingOrderDto.setMerchantId(merchantId); | ||||
| wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); | wxSharingOrderDto.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); | ||||
| wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); | wxSharingOrderDto.setPayAmount(wxPayOrder.getPayAmount()); | ||||
| @@ -532,7 +532,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | ||||
| } | } | ||||
| // 4. get user info | // 4. get user info | ||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getcUserId()); | |||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); | |||||
| if (user == null) { | if (user == null) { | ||||
| logger.error("找不到C端用户"); | logger.error("找不到C端用户"); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| @@ -175,7 +175,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { | |||||
| if (!param.getClass().equals(WxOrder.class)) | if (!param.getClass().equals(WxOrder.class)) | ||||
| return false; | return false; | ||||
| WxOrder order = (WxOrder)param; | WxOrder order = (WxOrder)param; | ||||
| cUserId = order.getcUserId(); | |||||
| cUserId = order.getCUserId(); | |||||
| tenantId = order.getTenantId(); | tenantId = order.getTenantId(); | ||||
| break; | break; | ||||
| default: | default: | ||||
| @@ -113,7 +113,7 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||||
| wxMerchantTradeDaily.setId(idWorker.nextId()); | wxMerchantTradeDaily.setId(idWorker.nextId()); | ||||
| wxMerchantTradeDaily.setTenantId(merchant.getTenantId()); | wxMerchantTradeDaily.setTenantId(merchant.getTenantId()); | ||||
| wxMerchantTradeDaily.setMerchantId(merchant.getId()); | wxMerchantTradeDaily.setMerchantId(merchant.getId()); | ||||
| wxMerchantTradeDaily.setbUserId(userId); | |||||
| wxMerchantTradeDaily.setBUserId(userId); | |||||
| wxMerchantTradeDaily.setTradeAmt(volume); | wxMerchantTradeDaily.setTradeAmt(volume); | ||||
| wxMerchantTradeDaily.setCreateDate(new Date()); | wxMerchantTradeDaily.setCreateDate(new Date()); | ||||
| wxMerchantTradeDaily.setUpdateDate(new Date()); | wxMerchantTradeDaily.setUpdateDate(new Date()); | ||||
| @@ -195,7 +195,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| orderQ.setTenantId(user.getTenantId()); | orderQ.setTenantId(user.getTenantId()); | ||||
| orderQ.setProductId(counpon.getId()); | orderQ.setProductId(counpon.getId()); | ||||
| orderQ.setType(EnumOrderType.COUPON.getCode()); | orderQ.setType(EnumOrderType.COUPON.getCode()); | ||||
| orderQ.setcUserId(user.getId()); | |||||
| orderQ.setCUserId(user.getId()); | |||||
| List<Integer> statusS = new ArrayList<>(); | List<Integer> statusS = new ArrayList<>(); | ||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); | statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); | ||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | ||||
| @@ -437,7 +437,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| record.setOrderNumber(orderNumber); | record.setOrderNumber(orderNumber); | ||||
| record.setType(EnumOrderType.PREPAIDCARD.getCode()); | record.setType(EnumOrderType.PREPAIDCARD.getCode()); | ||||
| record.setProductId(merchant.getId()); | record.setProductId(merchant.getId()); | ||||
| record.setcUserId(cUserId); | |||||
| record.setCUserId(cUserId); | |||||
| record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | ||||
| record.setPayment(payment); | record.setPayment(payment); | ||||
| record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | ||||
| @@ -590,7 +590,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| record.setOrderNumber(orderNumber); | record.setOrderNumber(orderNumber); | ||||
| record.setProductId(couponId); | record.setProductId(couponId); | ||||
| record.setType(EnumOrderType.COUPON.getCode()); | record.setType(EnumOrderType.COUPON.getCode()); | ||||
| record.setcUserId(user.getId()); | |||||
| record.setCUserId(user.getId()); | |||||
| record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | ||||
| record.setPayment(payment); | record.setPayment(payment); | ||||
| record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | ||||
| @@ -633,9 +633,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); | throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); | ||||
| } | } | ||||
| // 检查用户 | // 检查用户 | ||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(updateOrder.getcUserId()); | |||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(updateOrder.getCUserId()); | |||||
| if (user == null) { | if (user == null) { | ||||
| logger.error("用户不存在, userId: " + updateOrder.getcUserId()); | |||||
| logger.error("用户不存在, userId: " + updateOrder.getCUserId()); | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| } | } | ||||
| // 已支付,更新支付时间 | // 已支付,更新支付时间 | ||||
| @@ -693,9 +693,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); | throw new MallinkException(ErrorCode.COUPON_IS_TAKE_OFF); | ||||
| } | } | ||||
| // 检查用户 | // 检查用户 | ||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(updateOrder.getcUserId()); | |||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(updateOrder.getCUserId()); | |||||
| if (user == null) { | if (user == null) { | ||||
| logger.error("用户不存在, userId: " + updateOrder.getcUserId()); | |||||
| logger.error("用户不存在, userId: " + updateOrder.getCUserId()); | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| } | } | ||||
| sendInsideOrderSuccessMsg(updateOrder, coupon, user); | sendInsideOrderSuccessMsg(updateOrder, coupon, user); | ||||
| @@ -768,9 +768,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| public int microPayOrderSuccess(WxOrder updateOrder) { | public int microPayOrderSuccess(WxOrder updateOrder) { | ||||
| Date currentDate = new Date(); | Date currentDate = new Date(); | ||||
| // C端用户 | // C端用户 | ||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(updateOrder.getcUserId()); | |||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(updateOrder.getCUserId()); | |||||
| if (user == null) { | if (user == null) { | ||||
| logger.error("用户不存在, userId: " + updateOrder.getcUserId()); | |||||
| logger.error("用户不存在, userId: " + updateOrder.getCUserId()); | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| } | } | ||||
| // B端用户 | // B端用户 | ||||
| @@ -1002,7 +1002,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| if (wxPayOrder != null && wxMerchantBUser != null && | if (wxPayOrder != null && wxMerchantBUser != null && | ||||
| wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { | wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { | ||||
| WxSharingOrderDto sharingOrder = new WxSharingOrderDto(); | WxSharingOrderDto sharingOrder = new WxSharingOrderDto(); | ||||
| sharingOrder.setCUserId(wxPayOrder.getcUserId()); | |||||
| sharingOrder.setCUserId(wxPayOrder.getCUserId()); | |||||
| sharingOrder.setMerchantId(wxMerchantBUser.getMerchantId()); | sharingOrder.setMerchantId(wxMerchantBUser.getMerchantId()); | ||||
| sharingOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); | sharingOrder.setType(EnumProfitSharingOrderType.PROFIT_SHARING_SINGLE.getCode()); | ||||
| sharingOrder.setPayAmount(wxPayOrder.getPayAmount()); | sharingOrder.setPayAmount(wxPayOrder.getPayAmount()); | ||||
| @@ -1264,7 +1264,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| record.setTenantId(user.getTenantId()); | record.setTenantId(user.getTenantId()); | ||||
| record.setOrderNumber(orderNumber); | record.setOrderNumber(orderNumber); | ||||
| record.setProductId(coupon.getId()); | record.setProductId(coupon.getId()); | ||||
| record.setcUserId(user.getId()); | |||||
| record.setCUserId(user.getId()); | |||||
| record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | ||||
| record.setDetail(bodyStr); | record.setDetail(bodyStr); | ||||
| record.setCreateDate(curr); | record.setCreateDate(curr); | ||||
| @@ -1429,7 +1429,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| record.setOrderNumber(orderNumber); | record.setOrderNumber(orderNumber); | ||||
| record.setProductId(coupon.getId()); | record.setProductId(coupon.getId()); | ||||
| record.setType(EnumOrderType.COUPON.getCode()); | record.setType(EnumOrderType.COUPON.getCode()); | ||||
| record.setcUserId(user.getId()); | |||||
| record.setCUserId(user.getId()); | |||||
| record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | ||||
| record.setDetail(bodyStr); | record.setDetail(bodyStr); | ||||
| record.setCreateDate(curr); | record.setCreateDate(curr); | ||||
| @@ -206,7 +206,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| payOrderNo = String.valueOf(id); | payOrderNo = String.valueOf(id); | ||||
| record.setId(id); | record.setId(id); | ||||
| record.setTenantId(user.getTenantId()); | record.setTenantId(user.getTenantId()); | ||||
| record.setcUserId(user.getId()); | |||||
| record.setCUserId(user.getId()); | |||||
| record.setCreateTime(currentDate); | record.setCreateTime(currentDate); | ||||
| record.setUpdateTime(currentDate); | record.setUpdateTime(currentDate); | ||||
| record.setPayTimeStart(currentDate); | record.setPayTimeStart(currentDate); | ||||
| @@ -445,7 +445,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| payOrderNo = String.valueOf(id); | payOrderNo = String.valueOf(id); | ||||
| record.setId(id); | record.setId(id); | ||||
| record.setTenantId(user.getTenantId()); | record.setTenantId(user.getTenantId()); | ||||
| record.setbUserId(user.getId()); | |||||
| record.setBUserId(user.getId()); | |||||
| record.setCreateTime(currentDate); | record.setCreateTime(currentDate); | ||||
| record.setUpdateTime(currentDate); | record.setUpdateTime(currentDate); | ||||
| record.setPayTimeStart(currentDate); | record.setPayTimeStart(currentDate); | ||||
| @@ -1285,13 +1285,13 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| } | } | ||||
| wxCUserService.saveOrUpdate(userQ); | wxCUserService.saveOrUpdate(userQ); | ||||
| } | } | ||||
| record.setcUserId(userQ.getId()); | |||||
| record.setCUserId(userQ.getId()); | |||||
| // 修改支付订单状态 | // 修改支付订单状态 | ||||
| WxPayOrder updateOrder = new WxPayOrder(); | WxPayOrder updateOrder = new WxPayOrder(); | ||||
| updateOrder.setId(record.getId()); | updateOrder.setId(record.getId()); | ||||
| updateOrder.setOrderId(record.getOrderId()); | updateOrder.setOrderId(record.getOrderId()); | ||||
| updateOrder.setcUserId(userQ.getId()); | |||||
| updateOrder.setCUserId(userQ.getId()); | |||||
| updateOrder.setUpdateTime(currentDate); | updateOrder.setUpdateTime(currentDate); | ||||
| updateOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | updateOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | ||||
| updateOrder.setTransactionId(transactionId); | updateOrder.setTransactionId(transactionId); | ||||
| @@ -1304,7 +1304,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| } | } | ||||
| // 修改订单状态 | // 修改订单状态 | ||||
| order.setcUserId(userQ.getId()); | |||||
| order.setCUserId(userQ.getId()); | |||||
| try { | try { | ||||
| int _count = wxOrderService.microPayOrderSuccess(order); | int _count = wxOrderService.microPayOrderSuccess(order); | ||||
| if (_count > 1) { | if (_count > 1) { | ||||
| @@ -1319,7 +1319,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| // B端刷卡支付发券 | // B端刷卡支付发券 | ||||
| logger.info("订单刷卡发券 开始"); | logger.info("订单刷卡发券 开始"); | ||||
| try { | try { | ||||
| wxCouponOrderService.sendCouponAfterMicroPay(record.getTenantId(), record.getOrderId(), record.getcUserId()); | |||||
| wxCouponOrderService.sendCouponAfterMicroPay(record.getTenantId(), record.getOrderId(), record.getCUserId()); | |||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("订单刷卡发券失败: orderId: {}, payOrderId: {}", record.getOrderId(), record.getId()); | logger.error("订单刷卡发券失败: orderId: {}, payOrderId: {}", record.getOrderId(), record.getId()); | ||||
| logger.error("订单刷卡发券失败: " + e.getMessage()); | logger.error("订单刷卡发券失败: " + e.getMessage()); | ||||
| @@ -1364,7 +1364,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | ||||
| } | } | ||||
| if (order.getType().equals(EnumOrderType.COUPON.getCode())) { | if (order.getType().equals(EnumOrderType.COUPON.getCode())) { | ||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getcUserId()); | |||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); | |||||
| if (user == null) { | if (user == null) { | ||||
| logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| @@ -1476,7 +1476,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); | ||||
| } | } | ||||
| if (order.getType().equals(EnumOrderType.COUPON.getCode())) { | if (order.getType().equals(EnumOrderType.COUPON.getCode())) { | ||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getcUserId()); | |||||
| WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); | |||||
| if (user == null) { | if (user == null) { | ||||
| logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | logger.error("pay handle, order " + record.getOrderId() + " not found , payOrderid : " + record.getPayOrderNo()); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| @@ -128,7 +128,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| } | } | ||||
| WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(sharingOrder.getOrderId()); | WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(sharingOrder.getOrderId()); | ||||
| WxAppinfo appInfo = getAppinfo(payOrder.getcUserId()); | |||||
| WxAppinfo appInfo = getAppinfo(payOrder.getCUserId()); | |||||
| WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); | WxPayAccount payAccount = wxPayAccountMapper.selectByPrimaryKey(appInfo.getPayId()); | ||||
| List<JSONObject> receivers; | List<JSONObject> receivers; | ||||
| @@ -169,7 +169,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| psCmd.setAppid(appInfo.getParentAppId()); | psCmd.setAppid(appInfo.getParentAppId()); | ||||
| psCmd.setSub_appid(appInfo.getAppId()); | psCmd.setSub_appid(appInfo.getAppId()); | ||||
| psCmd.setNonce_str(Utility.generate32UUID()); | psCmd.setNonce_str(Utility.generate32UUID()); | ||||
| psCmd.setTransaction_id(sharingOrder.getTransaction()); | |||||
| psCmd.setTransaction_id(sharingOrder.getTransactionId()); | |||||
| psCmd.setOut_order_no(sharingOrder.getId().toString()); | psCmd.setOut_order_no(sharingOrder.getId().toString()); | ||||
| psCmd.setSign_type("HMAC-SHA256"); | psCmd.setSign_type("HMAC-SHA256"); | ||||
| psCmd.setReceivers(sharingOrder.getReceivers()); | psCmd.setReceivers(sharingOrder.getReceivers()); | ||||
| @@ -427,7 +427,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| WxPayOrder wxPayOrder = wxPayOrderMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); | WxPayOrder wxPayOrder = wxPayOrderMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); | ||||
| if (wxPayOrder == null) | if (wxPayOrder == null) | ||||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | ||||
| appInfo = getAppinfo(wxPayOrder.getcUserId()); | |||||
| appInfo = getAppinfo(wxPayOrder.getCUserId()); | |||||
| } else if(wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode()) | } else if(wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI.getCode()) | ||||
| ||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI_FINISH.getCode())){ | ||wxProfitSharingOrder.getType().equals(EnumProfitSharingOrderType.PROFIT_SHARING_MULTI_FINISH.getCode())){ | ||||
| WxCardSpend wxCardSpend = wxCardSpendMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); | WxCardSpend wxCardSpend = wxCardSpendMapper.selectByPrimaryKey(wxProfitSharingOrder.getOrderId()); | ||||
| @@ -450,7 +450,7 @@ public class WxProfitSharingOrderServiceImpl implements WxProfitSharingOrderServ | |||||
| wxProfitSharingQueryP.setMch_id(payAccount.getMchId()); | wxProfitSharingQueryP.setMch_id(payAccount.getMchId()); | ||||
| wxProfitSharingQueryP.setSub_mch_id(payAccount.getSubMchId()); | wxProfitSharingQueryP.setSub_mch_id(payAccount.getSubMchId()); | ||||
| wxProfitSharingQueryP.setNonce_str(Utility.generate32UUID()); | wxProfitSharingQueryP.setNonce_str(Utility.generate32UUID()); | ||||
| wxProfitSharingQueryP.setTransaction_id(wxProfitSharingOrder.getTransaction()); | |||||
| wxProfitSharingQueryP.setTransaction_id(wxProfitSharingOrder.getTransactionId()); | |||||
| wxProfitSharingQueryP.setOut_order_no(record.getId().toString()); | wxProfitSharingQueryP.setOut_order_no(record.getId().toString()); | ||||
| wxProfitSharingQueryP.setSign_type("HMAC-SHA256"); | wxProfitSharingQueryP.setSign_type("HMAC-SHA256"); | ||||
| String response; | String response; | ||||
| @@ -325,7 +325,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| rOrder.setOrderNumber(wxOrder.getOrderNumber()); // 退款订单填写支付订单orderNumber | rOrder.setOrderNumber(wxOrder.getOrderNumber()); // 退款订单填写支付订单orderNumber | ||||
| rOrder.setProductId(wxOrder.getProductId()); | rOrder.setProductId(wxOrder.getProductId()); | ||||
| rOrder.setType(EnumOrderType.COUPON.getCode()); | rOrder.setType(EnumOrderType.COUPON.getCode()); | ||||
| rOrder.setcUserId(wxOrder.getcUserId()); | |||||
| rOrder.setCUserId(wxOrder.getCUserId()); | |||||
| if (payType == EnumPayType.PAY_B_REFUND) { | if (payType == EnumPayType.PAY_B_REFUND) { | ||||
| rOrder.setProductId(bUserId); //B端发起退款后存B端用户ID在此 | rOrder.setProductId(bUserId); //B端发起退款后存B端用户ID在此 | ||||
| } | } | ||||
| @@ -363,7 +363,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| // 查找支付订单 | // 查找支付订单 | ||||
| WxPayOrder payOrderQ = new WxPayOrder(); | WxPayOrder payOrderQ = new WxPayOrder(); | ||||
| payOrderQ.setTenantId(appInfo.getTenantId()); | payOrderQ.setTenantId(appInfo.getTenantId()); | ||||
| payOrderQ.setcUserId(wxOrder.getcUserId()); | |||||
| payOrderQ.setCUserId(wxOrder.getCUserId()); | |||||
| payOrderQ.setOrderId(wxOrder.getId()); | payOrderQ.setOrderId(wxOrder.getId()); | ||||
| payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | ||||
| @@ -394,7 +394,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| record.setUpdateTime(currentDate); | record.setUpdateTime(currentDate); | ||||
| // 微信内部订单号 | // 微信内部订单号 | ||||
| record.setTransactionId(payOrder.getTransactionId()); | record.setTransactionId(payOrder.getTransactionId()); | ||||
| record.setCUserId(payOrder.getcUserId()); | |||||
| record.setCUserId(payOrder.getCUserId()); | |||||
| record.setTotalFee(payOrder.getPayAmount()); | record.setTotalFee(payOrder.getPayAmount()); | ||||
| record.setRefundFee(payOrder.getPayAmount()); | record.setRefundFee(payOrder.getPayAmount()); | ||||
| record.setRefundTimeStart(currentDate); | record.setRefundTimeStart(currentDate); | ||||
| @@ -633,7 +633,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| rOrder.setTenantId(appInfo.getTenantId()); | rOrder.setTenantId(appInfo.getTenantId()); | ||||
| rOrder.setOrderNumber(wxOrder.getOrderNumber()); // 退款订单填写支付订单orderNumber | rOrder.setOrderNumber(wxOrder.getOrderNumber()); // 退款订单填写支付订单orderNumber | ||||
| rOrder.setType(EnumOrderType.MICROPAY.getCode()); | rOrder.setType(EnumOrderType.MICROPAY.getCode()); | ||||
| rOrder.setcUserId(wxOrder.getcUserId()); | |||||
| rOrder.setCUserId(wxOrder.getCUserId()); | |||||
| if (payType == EnumPayType.PAY_B_REFUND) { | if (payType == EnumPayType.PAY_B_REFUND) { | ||||
| rOrder.setProductId(bUserId); //B端发起退款后存B端用户ID在此 | rOrder.setProductId(bUserId); //B端发起退款后存B端用户ID在此 | ||||
| } | } | ||||
| @@ -652,7 +652,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| // 查找支付订单 | // 查找支付订单 | ||||
| WxPayOrder payOrderQ = new WxPayOrder(); | WxPayOrder payOrderQ = new WxPayOrder(); | ||||
| payOrderQ.setTenantId(appInfo.getTenantId()); | payOrderQ.setTenantId(appInfo.getTenantId()); | ||||
| payOrderQ.setcUserId(wxOrder.getcUserId()); | |||||
| payOrderQ.setCUserId(wxOrder.getCUserId()); | |||||
| payOrderQ.setOrderId(wxOrder.getId()); | payOrderQ.setOrderId(wxOrder.getId()); | ||||
| payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | ||||
| @@ -683,7 +683,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| record.setUpdateTime(currentDate); | record.setUpdateTime(currentDate); | ||||
| // 微信内部订单号 | // 微信内部订单号 | ||||
| record.setTransactionId(payOrder.getTransactionId()); | record.setTransactionId(payOrder.getTransactionId()); | ||||
| record.setCUserId(payOrder.getcUserId()); | |||||
| record.setCUserId(payOrder.getCUserId()); | |||||
| record.setTotalFee(payOrder.getPayAmount()); | record.setTotalFee(payOrder.getPayAmount()); | ||||
| record.setRefundFee(payOrder.getPayAmount()); | record.setRefundFee(payOrder.getPayAmount()); | ||||
| record.setRefundTimeStart(currentDate); | record.setRefundTimeStart(currentDate); | ||||
| @@ -1262,7 +1262,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| // 查找支付订单 | // 查找支付订单 | ||||
| WxPayOrder payOrderQ = new WxPayOrder(); | WxPayOrder payOrderQ = new WxPayOrder(); | ||||
| payOrderQ.setTenantId(appInfo.getTenantId()); | payOrderQ.setTenantId(appInfo.getTenantId()); | ||||
| payOrderQ.setcUserId(wxOrder.getcUserId()); | |||||
| payOrderQ.setCUserId(wxOrder.getCUserId()); | |||||
| payOrderQ.setOrderId(wxOrder.getId()); | payOrderQ.setOrderId(wxOrder.getId()); | ||||
| payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); | ||||
| @@ -1293,7 +1293,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { | |||||
| record.setUpdateTime(currentDate); | record.setUpdateTime(currentDate); | ||||
| // 微信内部订单号 | // 微信内部订单号 | ||||
| record.setTransactionId(payOrder.getTransactionId()); | record.setTransactionId(payOrder.getTransactionId()); | ||||
| record.setCUserId(payOrder.getcUserId()); | |||||
| record.setCUserId(payOrder.getCUserId()); | |||||
| record.setTotalFee(payOrder.getPayAmount()); | record.setTotalFee(payOrder.getPayAmount()); | ||||
| record.setRefundFee(payOrder.getPayAmount()); | record.setRefundFee(payOrder.getPayAmount()); | ||||
| record.setRefundTimeStart(currentDate); | record.setRefundTimeStart(currentDate); | ||||
| @@ -325,7 +325,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| logger.info("RULE:" + busRule.toJSONString() + "\nAddScore: " + addScoreNumber); | logger.info("RULE:" + busRule.toJSONString() + "\nAddScore: " + addScoreNumber); | ||||
| // 5. 增长的成长值 | // 5. 增长的成长值 | ||||
| updateScore(order.getcUserId(), addScoreNumber); | |||||
| updateScore(order.getCUserId(), addScoreNumber); | |||||
| // 6. 记录历史 | // 6. 记录历史 | ||||
| recordPayScoreHistory(addScoreNumber, order, EnumScoreType.CONSUMPTION); | recordPayScoreHistory(addScoreNumber, order, EnumScoreType.CONSUMPTION); | ||||
| @@ -472,7 +472,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { | |||||
| WxScoreHistory history = new WxScoreHistory(); | WxScoreHistory history = new WxScoreHistory(); | ||||
| history.setId(idWorker.nextId()); | history.setId(idWorker.nextId()); | ||||
| history.setTenantId(order.getTenantId()); | history.setTenantId(order.getTenantId()); | ||||
| history.setCUserId(order.getcUserId()); | |||||
| history.setCUserId(order.getCUserId()); | |||||
| history.setCreateDate(new Date()); | history.setCreateDate(new Date()); | ||||
| history.setScoreType(EnumScoreType.CONSUMPTION.getCode()); | history.setScoreType(EnumScoreType.CONSUMPTION.getCode()); | ||||
| history.setOrderId(order.getId()); | history.setOrderId(order.getId()); | ||||
| @@ -49,7 +49,7 @@ public class FmInsideOrderSuccessMsgServiceImpl implements MsgSendService { | |||||
| logger.error("订单未找到: " + msg.getOrderId()); | logger.error("订单未找到: " + msg.getOrderId()); | ||||
| throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND.getCode(), "订单未找到" + msg.getOrderId()); | throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND.getCode(), "订单未找到" + msg.getOrderId()); | ||||
| } | } | ||||
| if(!record.getcUserId().equals(msg.getCUserId())) { | |||||
| if(!record.getCUserId().equals(msg.getCUserId())) { | |||||
| logger.error("订单用户不一致: " + msg.getOrderId()); | logger.error("订单用户不一致: " + msg.getOrderId()); | ||||
| throw new MallinkException(ErrorCode.ORDER_USER_NOT_MATCH.getCode(), "订单用户不一致" + msg.getOrderId()); | throw new MallinkException(ErrorCode.ORDER_USER_NOT_MATCH.getCode(), "订单用户不一致" + msg.getOrderId()); | ||||
| } | } | ||||