Merge remote-tracking branch 'origin/master'

lb-third/lb-third-delivery/src/main/java/com/ydd/third/controller/DeliveryController.java

@@ -1,18 +1,31 @@
 package com.ydd.third.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
+import com.ydd.third.common.dto.*;
 import com.ydd.third.common.vo.ResObject;
-import com.ydd.third.common.vo.vo.order.OrderQueryResultVo;
-import com.ydd.third.common.vo.vo.order.OrderQueryVo;
-import com.ydd.third.common.vo.vo.order.RiderLocationResultVo;
-import com.ydd.third.common.vo.vo.order.RiderLocationVo;
+import com.ydd.third.common.vo.huolalavo.HCity;
+import com.ydd.third.common.vo.huolalavo.HCityInfo;
+import com.ydd.third.common.vo.huolalavo.HPoiSearch;
+import com.ydd.third.common.vo.huolalavo.Haddress;
+import com.ydd.third.common.vo.shop.*;
+import com.ydd.third.common.vo.vo.order.*;
 import com.ydd.third.delivery.Client;
+import com.ydd.third.delivery.aipt.AiptClient;
+import com.ydd.third.delivery.dada.DadaClient;
+import com.ydd.third.delivery.fengniao.FengniaoClient;
+import com.ydd.third.delivery.huolala.HuolalaClient;
+import com.ydd.third.delivery.kuaifu.KfClient;
+import com.ydd.third.delivery.shansong.ShansongClient;
+import com.ydd.third.delivery.uupt.service.UuptUserDeliveryService;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project：lb-server
  * Class：WaimaiApi
@@ -24,12 +37,24 @@ import org.springframework.web.bind.annotation.*;
 @Api(value = "配送平台接口", tags = {"配送平台接口"})
 @Slf4j
 @RestController
-//@RequestMapping("/delivery")
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class DeliveryController  {
 
     private final Client client;
 
+    private final HuolalaClient huolalaClient;
+
+    private final UuptUserDeliveryService uuptUserDeliveryService;
+
+    private final ShansongClient shansongClient;
+
+    private final FengniaoClient fengniaoClient;
+
+    private final AiptClient aiptClient;
+
+    private final KfClient kfClient;
+
+    private final DadaClient dadaClient;
 
     @RequestMapping(value = "/queryOrderInfo",method = RequestMethod.POST)
     public ResObject<OrderQueryResultVo> list(@RequestBody OrderQueryVo orderQueryVo) {
@@ -39,13 +64,119 @@ public class DeliveryController  {
 
 
     @PostMapping(value = "/getRiderLocation")
-    public ResObject<RiderLocationResultVo> release(@RequestBody RiderLocationVo orderQueryVo) {
+    public ResObject<RiderLocationResultVo> getRiderLocation(@RequestBody RiderLocationVo orderQueryVo) {
         return client.getRiderLocation(orderQueryVo);
 
     }
 
-    @RequestMapping(value = "/test",method = RequestMethod.GET)
-    public String test(@RequestParam("id")Integer id) {
-        return "ok"+id;
+    @PostMapping(value="/getCityList")
+    public List<HCity> getCityList(){
+        return huolalaClient.getCityList();
+    }
+
+    @PostMapping(value="/getCityInfo")
+    public HCityInfo getCityInfo(@RequestParam("cityId") String cityId){
+        return huolalaClient.getCityInfo(cityId);
+    }
+
+
+    @RequestMapping(value="/poiSearch",method = RequestMethod.GET)
+    public  List<Haddress> poiSearch(@RequestBody HPoiSearch hPoiSearch){
+        return huolalaClient.poiSearch(hPoiSearch);
+    }
+
+    @PostMapping(value="/queryAmount")
+    public ResObject<AmountResultVo> queryAmount(@RequestBody QueryAmount queryAmount){
+        return client.queryAmount(queryAmount);
+    }
+    @GetMapping(value="/bindVirtualPhone")
+    public String bindVirtualPhone(@RequestParam("authToken")String authToken,@RequestParam("authToken")String outTradeNo,@RequestParam("authToken")String sendPhone){
+        return huolalaClient.bindVirtualPhone(authToken, outTradeNo, sendPhone);
+    }
+    @PostMapping(value="/orderAddTip")
+    public ResObject<OrderTipsResultVo> orderAddTip(@RequestBody OrderTipsVo orderVo){
+        return client.orderAddTip(orderVo);
+    }
+    @PostMapping(value="/queryOrderDeliverFee")
+    public ResObject<OrderResultVo> queryOrderDeliverFee(@RequestBody OrderVo orderVo){
+        return client.queryOrderDeliverFee(orderVo);
+    }
+    @PostMapping(value="/createShop")
+    public ResObject<ShopResultVo> createShop(@RequestBody ShopVo shopVo ){
+        return client.createShop(shopVo);
+    }
+    @PostMapping(value="/updateShop")
+    public ResObject<ShopResultVo> updateShop(@RequestBody ShopVo shopVo ){
+        return client.updateShop(shopVo);
+    }
+
+    @PostMapping(value="/cancelOrder")
+    public ResObject<CancelOrderResultVo> cancelOrder(@RequestBody CancelOrderVo orderVo){
+        return client.cancelOrder(orderVo);
+    }
+    @PostMapping(value="/createOrder")
+    public ResObject<OrderResultVo> createOrder(@RequestBody OrderVo orderVo){
+        return client.createOrder(orderVo);
+    }
+
+    @GetMapping(value="/uupt/cancelBind")
+    public ResObject<CancelBindResponse> cancelBind(@RequestParam("openId")String openId){
+        return uuptUserDeliveryService.cancelBind(openId);
+    }
+    @GetMapping(value="/uupt/bindUserApply")
+    public ResObject<BindUserApplyResponse> bindUserApply(@RequestParam("mobile")String mobile, @RequestParam("ip") String ip){
+        return uuptUserDeliveryService.bindUserApply(mobile, ip);
+    }
+    @GetMapping(value="/uupt/bindUserSubmit")
+    public ResObject<BindUserSubmitResponse> bindUserSubmit(@RequestParam("mobile")String mobile, @RequestParam("validateCode") String validateCode, @RequestParam("cityName") String cityName){
+        return uuptUserDeliveryService.bindUserSubmit(mobile, validateCode, cityName);
+    }
+    @GetMapping(value="/uupt/getBalance")
+    public ResObject<GetBalanceDetailResponse> getBalance(@RequestParam("openId")String openId){
+        return uuptUserDeliveryService.getBalance(openId);
+    }
+    //auth url
+    @GetMapping(value="/shansongAuthUrl")
+    public String shansongAuthUrl(@RequestParam("code")String thirdStoreId){
+        return  shansongClient.getAuthUrl(thirdStoreId);
+    }
+    @GetMapping(value="/shansong/cancelToken")
+    public ResObject cancelToken (@RequestParam("token")String token){
+        return  shansongClient.cancelToken(token);
+    }
+    @GetMapping(value="/fengniaoAuthUrl")
+    public String fengniaoAuthUrl(){
+        return  fengniaoClient.getAuthUrl();
+    }
+
+    @GetMapping(value="/hllAuthUrl")
+    public  String hllAuthUrl(){
+        return huolalaClient.getAuthUrl();
+    }
+    @GetMapping(value="/kfAuthUrl")
+    public String kfAuthUrl(@RequestParam("code")String code){
+        return  kfClient.getAuthUrlH5(code);
+    }
+
+    @GetMapping(value="/dada/partyTicket")
+    public JSONObject partyTicket(@RequestParam("type")Integer type){
+        return dadaClient.partyTicket(type);
+    }
+    @GetMapping(value="/dada/authUrl")
+    public String dadaAuthUrl(@RequestParam("result")String result,@RequestParam("type")Integer type,@RequestParam("code")String code){
+        return dadaClient.getPartyOauth(result, type, code);
+    }
+    @GetMapping(value="/aptAuthUrl")
+    public  String aptAuthUrl(@RequestParam("code")String code){
+        return aiptClient.getAuthUrl(code);
+    }
+    @GetMapping(value="/apt/unBind")
+    public AiptUnBindDto unBind (@RequestParam("account")String account){
+        return aiptClient.unBind(account);
+    }
+
+    @PostMapping(value="/apt/queryShop")
+    public  ResObject<ShopQueryResultVo> queryShop (@RequestBody ShopQueryVo shopQueryVo ){
+        return client.queryShop(shopQueryVo);
     }
 }

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/Client.java

@@ -5,11 +5,11 @@ import com.ydd.common.exception.BusinessException;
 import com.ydd.third.common.utils.HttpUtils;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.waimai.*;
 import com.ydd.third.common.vo.waimai.meituan.RefundFoodItemVo;
 import com.ydd.third.waimai.eleRetai.EleRetaiClient;
 import com.ydd.third.waimai.eleme.ElemeClient;
 import com.ydd.third.waimai.meituan.MeituanClient;
-import com.ydd.third.waimai.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleRetai/EleRetaiClient.java

@@ -13,8 +13,7 @@ import com.ydd.third.waimai.eleRetai.common.AbstractAPIRequest;
 import com.ydd.third.waimai.eleRetai.common.EleRetaiApi;
 import com.ydd.third.waimai.eleRetai.param.*;
 import com.ydd.third.waimai.eleRetai.vo.*;
-import com.ydd.third.waimai.vo.CancelOrderVo;
-import com.ydd.third.waimai.vo.SyncRiderPositionStatusVo;
+import com.ydd.third.common.vo.waimai.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/ElemeAuthClient.java

@@ -2,13 +2,13 @@ package com.ydd.third.waimai.eleme;
 
 import com.ydd.common.core.redis.RedisCache;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.waimai.ElemeMerchantResultVo;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.user.OUser;
+import com.ydd.third.common.vo.waimai.eleme.config.Config;
+import com.ydd.third.common.vo.waimai.eleme.oauth.OAuthClient;
+import com.ydd.third.common.vo.waimai.eleme.oauth.response.Token;
 import com.ydd.third.waimai.config.WaimaiConfig;
-import com.ydd.third.waimai.eleme.api.entity.user.OUser;
 import com.ydd.third.waimai.eleme.api.service.UserService;
-import com.ydd.third.waimai.eleme.config.Config;
-import com.ydd.third.waimai.eleme.oauth.OAuthClient;
-import com.ydd.third.waimai.eleme.oauth.response.Token;
-import com.ydd.third.waimai.vo.ElemeMerchantResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/ElemeCallback.java

@@ -5,12 +5,12 @@ import com.ydd.common.core.redis.RedisCache;
 import com.ydd.third.common.utils.JSONUtil;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.waimai.ElemeOrderRefundResultVo;
+import com.ydd.third.common.vo.waimai.ElemeOrderResultVo;
+import com.ydd.third.common.vo.waimai.ElemeOrderStateResultVo;
+import com.ydd.third.common.vo.waimai.ElemeRemindResultVo;
+import com.ydd.third.common.vo.waimai.eleme.utils.SignatureUtil;
 import com.ydd.third.waimai.config.WaimaiConfig;
-import com.ydd.third.waimai.eleme.utils.SignatureUtil;
-import com.ydd.third.waimai.vo.ElemeOrderRefundResultVo;
-import com.ydd.third.waimai.vo.ElemeOrderResultVo;
-import com.ydd.third.waimai.vo.ElemeOrderStateResultVo;
-import com.ydd.third.waimai.vo.ElemeRemindResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/ElemeClient.java

@@ -1,33 +1,33 @@
 package com.ydd.third.waimai.eleme;
 
-import java.util.*;
-
 import com.alibaba.fastjson.JSONObject;
 import com.ydd.common.core.redis.RedisCache;
 import com.ydd.third.common.utils.JSONUtil;
 import com.ydd.third.common.utils.StringUtils;
 import com.ydd.third.common.vo.ResObject;
+import com.ydd.third.common.vo.waimai.*;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.message.OMessage;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.order.*;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.product.OItem;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.product.QueryPage;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.shop.OShop;
+import com.ydd.third.common.vo.waimai.eleme.api.entity.user.OUser;
+import com.ydd.third.common.vo.waimai.eleme.api.enumeration.order.OInvalidateType;
+import com.ydd.third.common.vo.waimai.eleme.api.enumeration.order.OSelfDeliveryStateEnum;
+import com.ydd.third.common.vo.waimai.eleme.api.enumeration.order.OrderSource;
+import com.ydd.third.common.vo.waimai.eleme.api.enumeration.order.ReplyReminderType;
+import com.ydd.third.common.vo.waimai.eleme.api.exception.ServiceException;
+import com.ydd.third.common.vo.waimai.eleme.config.Config;
+import com.ydd.third.common.vo.waimai.eleme.oauth.response.Token;
 import com.ydd.third.waimai.config.WaimaiConfig;
-import com.ydd.third.waimai.eleme.api.entity.message.OMessage;
-import com.ydd.third.waimai.eleme.api.entity.order.*;
-import com.ydd.third.waimai.eleme.api.entity.product.OItem;
-import com.ydd.third.waimai.eleme.api.entity.product.QueryPage;
-import com.ydd.third.waimai.eleme.api.entity.user.OUser;
-import com.ydd.third.waimai.eleme.api.enumeration.order.OInvalidateType;
-import com.ydd.third.waimai.eleme.api.enumeration.order.OSelfDeliveryStateEnum;
-import com.ydd.third.waimai.eleme.api.enumeration.order.OrderSource;
-import com.ydd.third.waimai.eleme.api.enumeration.order.ReplyReminderType;
-import com.ydd.third.waimai.eleme.api.exception.ServiceException;
 import com.ydd.third.waimai.eleme.api.service.*;
-import com.ydd.third.waimai.eleme.config.Config;
-import com.ydd.third.waimai.eleme.oauth.response.Token;
-import com.ydd.third.waimai.eleme.api.entity.shop.OShop;
-import com.ydd.third.waimai.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName Client

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/annotation/Service.java

@@ -1,12 +0,0 @@
-package com.ydd.third.waimai.eleme.api.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Service {
-    String value();
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/base/BaseNopService.java

@@ -1,41 +0,0 @@
-package com.ydd.third.waimai.eleme.api.base;
-
-import com.ydd.third.waimai.eleme.api.annotation.Service;
-import com.ydd.third.waimai.eleme.api.exception.ServiceException;
-import com.ydd.third.waimai.eleme.config.Config;
-import com.ydd.third.waimai.eleme.oauth.response.Token;
-import com.ydd.third.waimai.eleme.utils.WebUtils;
-
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Map;
-
-public class BaseNopService {
-    private Token token;
-    private Map<String, Method> methodMap = new HashMap<String, Method>();
-    private Class service;
-    private Config config;
-
-    public BaseNopService(Config config, Token token, Class service) {
-        this.token = token;
-        this.service = service;
-        this.config = config;
-        Method[] methods = service.getMethods();
-        for (Method method : methods) {
-            methodMap.put(method.getName(), method);
-        }
-    }
-
-    public <T> T call(String action,Map<String, Object> parameters) throws ServiceException {
-        String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-        Method method = getMethod(methodName);
-        Service annotation = (Service) service.getAnnotation(Service.class);
-        if (annotation == null)
-            throw new RuntimeException("服务未找到Service注解");
-        return WebUtils.call(config, action, parameters, token, method.getGenericReturnType());
-    }
-
-    private Method getMethod(String methodName) {
-        return methodMap.get(methodName);
-    }
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ActivityApplyInfo.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ActivityApplyInfo{
-
-    /**
-     * 报名的店铺Id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 报名的菜品信息
-     */
-    private List<FoodApplyInfo> foodApplyInfos;
-    public List<FoodApplyInfo> getFoodApplyInfos() {
-        return foodApplyInfos;
-    }
-    public void setFoodApplyInfos(List<FoodApplyInfo> foodApplyInfos) {
-        this.foodApplyInfos = foodApplyInfos;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ActivityDateTime.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ActivityDateTime{
-
-    /**
-     * 活动有效日期段
-     */
-    private List<SActivityDate> dates;
-    public List<SActivityDate> getDates() {
-        return dates;
-    }
-    public void setDates(List<SActivityDate> dates) {
-        this.dates = dates;
-    }
-    
-    /**
-     * 活动有效工作日，默认为
-     */
-    private List<Integer> weekdays;
-    public List<Integer> getWeekdays() {
-        return weekdays;
-    }
-    public void setWeekdays(List<Integer> weekdays) {
-        this.weekdays = weekdays;
-    }
-    
-    /**
-     * 活动有效时间段，默认为
-     */
-    private List<SActivityTime> times;
-    public List<SActivityTime> getTimes() {
-        return times;
-    }
-    public void setTimes(List<SActivityTime> times) {
-        this.times = times;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ActivityFoodRelation.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ActivityFoodRelation{
-
-    /**
-     * 店铺Id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 商品规格Id
-     */
-    private Long specId;
-    public Long getSpecId() {
-        return specId;
-    }
-    public void setSpecId(Long specId) {
-        this.specId = specId;
-    }
-    
-    /**
-     * 参与关系Id
-     */
-    private Long participateId;
-    public Long getParticipateId() {
-        return participateId;
-    }
-    public void setParticipateId(Long participateId) {
-        this.participateId = participateId;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ActivityTemplate.java

@@ -1,101 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ActivityTemplate{
-
-    /**
-     * 店铺id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 扣减额,单位:分
-     */
-    private Long reductionAmt;
-    public Long getReductionAmt() {
-        return reductionAmt;
-    }
-    public void setReductionAmt(Long reductionAmt) {
-        this.reductionAmt = reductionAmt;
-    }
-    
-    /**
-     * 门槛,单位:分
-     */
-    private Long thresholdAmt;
-    public Long getThresholdAmt() {
-        return thresholdAmt;
-    }
-    public void setThresholdAmt(Long thresholdAmt) {
-        this.thresholdAmt = thresholdAmt;
-    }
-    
-    /**
-     * 有效期
-     */
-    private Long duration;
-    public Long getDuration() {
-        return duration;
-    }
-    public void setDuration(Long duration) {
-        this.duration = duration;
-    }
-    
-    /**
-     * 活动同享或互斥
-     */
-    private Boolean mutex;
-    public Boolean getMutex() {
-        return mutex;
-    }
-    public void setMutex(Boolean mutex) {
-        this.mutex = mutex;
-    }
-    
-    /**
-     * 活动开始日期
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date gmtStart;
-    public Date getGmtStart() {
-        return gmtStart;
-    }
-    public void setGmtStart(Date gmtStart) {
-        this.gmtStart = gmtStart;
-    }
-    
-    /**
-     * 活动结束日期
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date gmtEnd;
-    public Date getGmtEnd() {
-        return gmtEnd;
-    }
-    public void setGmtEnd(Date gmtEnd) {
-        this.gmtEnd = gmtEnd;
-    }
-    
-    /**
-     * 可用场景信息
-     */
-    private List<String> usableScenes;
-    public List<String> getUsableScenes() {
-        return usableScenes;
-    }
-    public void setUsableScenes(List<String> usableScenes) {
-        this.usableScenes = usableScenes;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ActivityTemplateDetail.java

@@ -1,101 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ActivityTemplateDetail{
-
-    /**
-     * 活动模板id
-     */
-    private Long templateId;
-    public Long getTemplateId() {
-        return templateId;
-    }
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-    
-    /**
-     * 扣减额,单位:分
-     */
-    private Long reductionAmt;
-    public Long getReductionAmt() {
-        return reductionAmt;
-    }
-    public void setReductionAmt(Long reductionAmt) {
-        this.reductionAmt = reductionAmt;
-    }
-    
-    /**
-     * 门槛,单位:分
-     */
-    private Long thresholdAmt;
-    public Long getThresholdAmt() {
-        return thresholdAmt;
-    }
-    public void setThresholdAmt(Long thresholdAmt) {
-        this.thresholdAmt = thresholdAmt;
-    }
-    
-    /**
-     * 有效期
-     */
-    private Long duration;
-    public Long getDuration() {
-        return duration;
-    }
-    public void setDuration(Long duration) {
-        this.duration = duration;
-    }
-    
-    /**
-     * 活动同享或互斥
-     */
-    private Boolean mutex;
-    public Boolean getMutex() {
-        return mutex;
-    }
-    public void setMutex(Boolean mutex) {
-        this.mutex = mutex;
-    }
-    
-    /**
-     * 活动开始日期
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date gmtStart;
-    public Date getGmtStart() {
-        return gmtStart;
-    }
-    public void setGmtStart(Date gmtStart) {
-        this.gmtStart = gmtStart;
-    }
-    
-    /**
-     * 活动结束日期
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date gmtEnd;
-    public Date getGmtEnd() {
-        return gmtEnd;
-    }
-    public void setGmtEnd(Date gmtEnd) {
-        this.gmtEnd = gmtEnd;
-    }
-    
-    /**
-     * 活动状态
-     */
-    private String status;
-    public String getStatus() {
-        return status;
-    }
-    public void setStatus(String status) {
-        this.status = status;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ActivityTemplateInvalidModel.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ActivityTemplateInvalidModel{
-
-    /**
-     * 店铺id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 活动模板id
-     */
-    private Long templateId;
-    public Long getTemplateId() {
-        return templateId;
-    }
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ActivityTemplateQueryModel.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ActivityTemplateQueryModel{
-
-    /**
-     * 店铺id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 活动模板id
-     */
-    private Long templateId;
-    public Long getTemplateId() {
-        return templateId;
-    }
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ActivityTemplateUpdateModel.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ActivityTemplateUpdateModel{
-
-    /**
-     * 店铺id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 活动模板id
-     */
-    private Long templateId;
-    public Long getTemplateId() {
-        return templateId;
-    }
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-    
-    /**
-     * 优惠金额,单位:分
-     */
-    private Long reductionAmt;
-    public Long getReductionAmt() {
-        return reductionAmt;
-    }
-    public void setReductionAmt(Long reductionAmt) {
-        this.reductionAmt = reductionAmt;
-    }
-    
-    /**
-     * 门槛,单位:分
-     */
-    private Long thresholdAmt;
-    public Long getThresholdAmt() {
-        return thresholdAmt;
-    }
-    public void setThresholdAmt(Long thresholdAmt) {
-        this.thresholdAmt = thresholdAmt;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ChainSkuCouponDetail.java

@@ -1,77 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ChainSkuCouponDetail{
-
-    /**
-     * 优惠内容
-     */
-    private Double content;
-    public Double getContent() {
-        return content;
-    }
-    public void setContent(Double content) {
-        this.content = content;
-    }
-    
-    /**
-     * 优惠券名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 优惠类型
-     */
-    private Integer benefitTyp;
-    public Integer getBenefitTyp() {
-        return benefitTyp;
-    }
-    public void setBenefitTyp(Integer benefitTyp) {
-        this.benefitTyp = benefitTyp;
-    }
-    
-    /**
-     * 券有效期
-     */
-    private Long duration;
-    public Long getDuration() {
-        return duration;
-    }
-    public void setDuration(Long duration) {
-        this.duration = duration;
-    }
-    
-    /**
-     * 通用的店铺范围
-     */
-    private List<Long> shopIdList;
-    public List<Long> getShopIdList() {
-        return shopIdList;
-    }
-    public void setShopIdList(List<Long> shopIdList) {
-        this.shopIdList = shopIdList;
-    }
-    
-    /**
-     * 新商品连锁标示
-     */
-    private List<String> pIds;
-    public List<String> getPIds() {
-        return pIds;
-    }
-    public void setPIds(List<String> pIds) {
-        this.pIds = pIds;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/CommonTargetCouponDetail.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CommonTargetCouponDetail{
-
-    /**
-     * 门槛
-     */
-    private Long threshold;
-    public Long getThreshold() {
-        return threshold;
-    }
-    public void setThreshold(Long threshold) {
-        this.threshold = threshold;
-    }
-    
-    /**
-     * 扣减额
-     */
-    private Double discounts;
-    public Double getDiscounts() {
-        return discounts;
-    }
-    public void setDiscounts(Double discounts) {
-        this.discounts = discounts;
-    }
-    
-    /**
-     * 红包有效期
-     */
-    private Long duration;
-    public Long getDuration() {
-        return duration;
-    }
-    public void setDuration(Long duration) {
-        this.duration = duration;
-    }
-    
-    /**
-     * 通用的店铺范围
-     */
-    private List<Long> shopIdList;
-    public List<Long> getShopIdList() {
-        return shopIdList;
-    }
-    public void setShopIdList(List<Long> shopIdList) {
-        this.shopIdList = shopIdList;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/CommonTargetSkuCouponDetail.java

@@ -1,77 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CommonTargetSkuCouponDetail{
-
-    /**
-     * 优惠内容
-     */
-    private Double content;
-    public Double getContent() {
-        return content;
-    }
-    public void setContent(Double content) {
-        this.content = content;
-    }
-    
-    /**
-     * 优惠券名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 优惠类型
-     */
-    private Integer benefitTyp;
-    public Integer getBenefitTyp() {
-        return benefitTyp;
-    }
-    public void setBenefitTyp(Integer benefitTyp) {
-        this.benefitTyp = benefitTyp;
-    }
-    
-    /**
-     * 券有效期
-     */
-    private Long duration;
-    public Long getDuration() {
-        return duration;
-    }
-    public void setDuration(Long duration) {
-        this.duration = duration;
-    }
-    
-    /**
-     * 商品连锁标示
-     */
-    private String extendCode;
-    public String getExtendCode() {
-        return extendCode;
-    }
-    public void setExtendCode(String extendCode) {
-        this.extendCode = extendCode;
-    }
-    
-    /**
-     * 通用的店铺范围
-     */
-    private List<Long> shopIdList;
-    public List<Long> getShopIdList() {
-        return shopIdList;
-    }
-    public void setShopIdList(List<Long> shopIdList) {
-        this.shopIdList = shopIdList;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/Condition.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class Condition{
-
-    /**
-     * 使用门槛（满足多少元可以用）
-     */
-    private Double threshold;
-    public Double getThreshold() {
-        return threshold;
-    }
-    public void setThreshold(Double threshold) {
-        this.threshold = threshold;
-    }
-    
-    /**
-     * 有效时长（券有效期）
-     */
-    private Integer duration;
-    public Integer getDuration() {
-        return duration;
-    }
-    public void setDuration(Integer duration) {
-        this.duration = duration;
-    }
-    
-    /**
-     * 发放规则
-     */
-    private GiveOutRule giveOutRule;
-    public GiveOutRule getGiveOutRule() {
-        return giveOutRule;
-    }
-    public void setGiveOutRule(GiveOutRule giveOutRule) {
-        this.giveOutRule = giveOutRule;
-    }
-    
-    /**
-     * 领取规则
-     */
-    private ReceiveRule receiveRule;
-    public ReceiveRule getReceiveRule() {
-        return receiveRule;
-    }
-    public void setReceiveRule(ReceiveRule receiveRule) {
-        this.receiveRule = receiveRule;
-    }
-    
-    /**
-     * 红包活动开始及结束时间
-     */
-    private OActivityDate activityDate;
-    public OActivityDate getActivityDate() {
-        return activityDate;
-    }
-    public void setActivityDate(OActivityDate activityDate) {
-        this.activityDate = activityDate;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/CouponBenefit.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CouponBenefit{
-
-    /**
-     * 红包优惠类型
-     */
-    private CouponBenefitType couponBenefitType;
-    public CouponBenefitType getCouponBenefitType() {
-        return couponBenefitType;
-    }
-    public void setCouponBenefitType(CouponBenefitType couponBenefitType) {
-        this.couponBenefitType = couponBenefitType;
-    }
-    
-    /**
-     * 红包优惠内容
-     */
-    private CouponBenefitContent benefitContent;
-    public CouponBenefitContent getBenefitContent() {
-        return benefitContent;
-    }
-    public void setBenefitContent(CouponBenefitContent benefitContent) {
-        this.benefitContent = benefitContent;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/CouponBenefitContent.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CouponBenefitContent{
-
-    /**
-     * 固定金额
-     */
-    private Double fixed;
-    public Double getFixed() {
-        return fixed;
-    }
-    public void setFixed(Double fixed) {
-        this.fixed = fixed;
-    }
-    
-    /**
-     * 随机金额上限
-     */
-    private Double ceil;
-    public Double getCeil() {
-        return ceil;
-    }
-    public void setCeil(Double ceil) {
-        this.ceil = ceil;
-    }
-    
-    /**
-     * 随机金额下限
-     */
-    private Double floor;
-    public Double getFloor() {
-        return floor;
-    }
-    public void setFloor(Double floor) {
-        this.floor = floor;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/CouponTemplate.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CouponTemplate{
-
-    /**
-     * 使用门槛（满多少可以用）
-     */
-    private Double threshold;
-    public Double getThreshold() {
-        return threshold;
-    }
-    public void setThreshold(Double threshold) {
-        this.threshold = threshold;
-    }
-    
-    /**
-     * 减免金额
-     */
-    private Double reduction;
-    public Double getReduction() {
-        return reduction;
-    }
-    public void setReduction(Double reduction) {
-        this.reduction = reduction;
-    }
-    
-    /**
-     * 生效时间
-     */
-    private String beginTime;
-    public String getBeginTime() {
-        return beginTime;
-    }
-    public void setBeginTime(String beginTime) {
-        this.beginTime = beginTime;
-    }
-    
-    /**
-     * 失效时间
-     */
-    private String endTime;
-    public String getEndTime() {
-        return endTime;
-    }
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/CouponTransactionCriteria.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CouponTransactionCriteria{
-
-    /**
-     * 饿了么用户id
-     */
-    private Long userId;
-    public Long getUserId() {
-        return userId;
-    }
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-    
-    /**
-     * 券id
-     */
-    private Long couponId;
-    public Long getCouponId() {
-        return couponId;
-    }
-    public void setCouponId(Long couponId) {
-        this.couponId = couponId;
-    }
-    
-    /**
-     * 饿了么订单id
-     */
-    private Long orderId;
-    public Long getOrderId() {
-        return orderId;
-    }
-    public void setOrderId(Long orderId) {
-        this.orderId = orderId;
-    }
-    
-    /**
-     * 饿了么店铺id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/CouponUsedInfo.java

@@ -1,77 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CouponUsedInfo{
-
-    /**
-     * 用户id
-     */
-    private Long userId;
-    public Long getUserId() {
-        return userId;
-    }
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-    
-    /**
-     * 用户名
-     */
-    private String userName;
-    public String getUserName() {
-        return userName;
-    }
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-    
-    /**
-     * 用户手机号
-     */
-    private String mobile;
-    public String getMobile() {
-        return mobile;
-    }
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-    
-    /**
-     * 手机有效性
-     */
-    private Boolean mobileValid;
-    public Boolean getMobileValid() {
-        return mobileValid;
-    }
-    public void setMobileValid(Boolean mobileValid) {
-        this.mobileValid = mobileValid;
-    }
-    
-    /**
-     * 订单ID（字符串）
-     */
-    private String orderIdStr;
-    public String getOrderIdStr() {
-        return orderIdStr;
-    }
-    public void setOrderIdStr(String orderIdStr) {
-        this.orderIdStr = orderIdStr;
-    }
-    
-    /**
-     * 红包使用状态
-     */
-    private CouponStatus couponStatus;
-    public CouponStatus getCouponStatus() {
-        return couponStatus;
-    }
-    public void setCouponStatus(CouponStatus couponStatus) {
-        this.couponStatus = couponStatus;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/CreateInfo.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CreateInfo{
-
-    /**
-     * 店铺Id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 红包活动名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 红包活动类型
-     */
-    private CouponActivityType type;
-    public CouponActivityType getType() {
-        return type;
-    }
-    public void setType(CouponActivityType type) {
-        this.type = type;
-    }
-    
-    /**
-     * 红包优惠
-     */
-    private CouponBenefit benefit;
-    public CouponBenefit getBenefit() {
-        return benefit;
-    }
-    public void setBenefit(CouponBenefit benefit) {
-        this.benefit = benefit;
-    }
-    
-    /**
-     * 红包活动条件
-     */
-    private Condition condition;
-    public Condition getCondition() {
-        return condition;
-    }
-    public void setCondition(Condition condition) {
-        this.condition = condition;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/CreateTemplateResult.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CreateTemplateResult{
-
-    /**
-     * 活动模板id
-     */
-    private Long templateId;
-    public Long getTemplateId() {
-        return templateId;
-    }
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-    
-    /**
-     * 创建活动是否成功
-     */
-    private Boolean success;
-    public Boolean getSuccess() {
-        return success;
-    }
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-    
-    /**
-     * 失败原因
-     */
-    private String reason;
-    public String getReason() {
-        return reason;
-    }
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-    
-    /**
-     * 异常code
-     */
-    private String errorCode;
-    public String getErrorCode() {
-        return errorCode;
-    }
-    public void setErrorCode(String errorCode) {
-        this.errorCode = errorCode;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/FoodApplyInfo.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class FoodApplyInfo{
-
-    /**
-     * 菜品Id
-     */
-    private Long itemId;
-    public Long getItemId() {
-        return itemId;
-    }
-    public void setItemId(Long itemId) {
-        this.itemId = itemId;
-    }
-    
-    /**
-     * 报名的菜品库存
-     */
-    private Integer stock;
-    public Integer getStock() {
-        return stock;
-    }
-    public void setStock(Integer stock) {
-        this.stock = stock;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/GiveOutRule.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class GiveOutRule{
-
-    /**
-     * 红包的发放类型（限定总量（总库存）,每天限量（每日库存））
-     */
-    private OStockType type;
-    public OStockType getType() {
-        return type;
-    }
-    public void setType(OStockType type) {
-        this.type = type;
-    }
-    
-    /**
-     * 要发放的红包数量
-     */
-    private Integer quantity;
-    public Integer getQuantity() {
-        return quantity;
-    }
-    public void setQuantity(Integer quantity) {
-        this.quantity = quantity;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/Icon.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class Icon{
-
-    /**
-     * icon文字
-     */
-    private String text;
-    public String getText() {
-        return text;
-    }
-    public void setText(String text) {
-        this.text = text;
-    }
-    
-    /**
-     * 背景颜色
-     */
-    private String backgroud;
-    public String getBackgroud() {
-        return backgroud;
-    }
-    public void setBackgroud(String backgroud) {
-        this.backgroud = backgroud;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/InvalidTemplateResult.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class InvalidTemplateResult{
-
-    /**
-     * 活动模板id
-     */
-    private Long templateId;
-    public Long getTemplateId() {
-        return templateId;
-    }
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-    
-    /**
-     * 创建活动是否成功
-     */
-    private Boolean success;
-    public Boolean getSuccess() {
-        return success;
-    }
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-    
-    /**
-     * 失败原因
-     */
-    private String reason;
-    public String getReason() {
-        return reason;
-    }
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-    
-    /**
-     * 异常code
-     */
-    private String errorCode;
-    public String getErrorCode() {
-        return errorCode;
-    }
-    public void setErrorCode(String errorCode) {
-        this.errorCode = errorCode;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ModifyTemplateResult.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ModifyTemplateResult{
-
-    /**
-     * 活动模板id
-     */
-    private Long templateId;
-    public Long getTemplateId() {
-        return templateId;
-    }
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-    
-    /**
-     * 创建活动是否成功
-     */
-    private Boolean success;
-    public Boolean getSuccess() {
-        return success;
-    }
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-    
-    /**
-     * 失败原因
-     */
-    private String reason;
-    public String getReason() {
-        return reason;
-    }
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-    
-    /**
-     * 异常code
-     */
-    private String errorCode;
-    public String getErrorCode() {
-        return errorCode;
-    }
-    public void setErrorCode(String errorCode) {
-        this.errorCode = errorCode;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OActivityDate.java

@@ -1,35 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OActivityDate{
-
-    /**
-     * 活动开始日期
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date beginDate;
-    public Date getBeginDate() {
-        return beginDate;
-    }
-    public void setBeginDate(Date beginDate) {
-        this.beginDate = beginDate;
-    }
-    
-    /**
-     * 活动结束日期
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date endDate;
-    public Date getEndDate() {
-        return endDate;
-    }
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OActivityDateTime.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OActivityDateTime{
-
-    /**
-     * 活动有效日期段
-     */
-    private OActivityDate activityDate;
-    public OActivityDate getActivityDate() {
-        return activityDate;
-    }
-    public void setActivityDate(OActivityDate activityDate) {
-        this.activityDate = activityDate;
-    }
-    
-    /**
-     * 活动有效时间段，默认为[00:00:00.000 - 23:59:59.999]
-     */
-    private OActivityTime activityTime;
-    public OActivityTime getActivityTime() {
-        return activityTime;
-    }
-    public void setActivityTime(OActivityTime activityTime) {
-        this.activityTime = activityTime;
-    }
-    
-    /**
-     * 活动有效工作日，默认为[1,2,3,4,5,6,7]
-     */
-    private List<Integer> weekdays;
-    public List<Integer> getWeekdays() {
-        return weekdays;
-    }
-    public void setWeekdays(List<Integer> weekdays) {
-        this.weekdays = weekdays;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OActivityDetail.java

@@ -1,209 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OActivityDetail{
-
-    /**
-     * 活动Id
-     */
-    private Long activityId;
-    public Long getActivityId() {
-        return activityId;
-    }
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-    
-    /**
-     * 活动名称
-     */
-    private String activityName;
-    public String getActivityName() {
-        return activityName;
-    }
-    public void setActivityName(String activityName) {
-        this.activityName = activityName;
-    }
-    
-    /**
-     * 活动类型
-     */
-    private OActivityType activityTypeEnum;
-    public OActivityType getActivityTypeEnum() {
-        return activityTypeEnum;
-    }
-    public void setActivityTypeEnum(OActivityType activityTypeEnum) {
-        this.activityTypeEnum = activityTypeEnum;
-    }
-    
-    /**
-     * 活动状态
-     */
-    private OActivityStatus activityStatus;
-    public OActivityStatus getActivityStatus() {
-        return activityStatus;
-    }
-    public void setActivityStatus(OActivityStatus activityStatus) {
-        this.activityStatus = activityStatus;
-    }
-    
-    /**
-     * 菜品数量限制
-     */
-    private OFoodQuantityLimit foodQuantityLimit;
-    public OFoodQuantityLimit getFoodQuantityLimit() {
-        return foodQuantityLimit;
-    }
-    public void setFoodQuantityLimit(OFoodQuantityLimit foodQuantityLimit) {
-        this.foodQuantityLimit = foodQuantityLimit;
-    }
-    
-    /**
-     * 菜品库存限制
-     */
-    private OFoodStockLimit foodStockLimit;
-    public OFoodStockLimit getFoodStockLimit() {
-        return foodStockLimit;
-    }
-    public void setFoodStockLimit(OFoodStockLimit foodStockLimit) {
-        this.foodStockLimit = foodStockLimit;
-    }
-    
-    /**
-     * 活动价格
-     */
-    private BigDecimal activityPrice;
-    public BigDecimal getActivityPrice() {
-        return activityPrice;
-    }
-    public void setActivityPrice(BigDecimal activityPrice) {
-        this.activityPrice = activityPrice;
-    }
-    
-    /**
-     * 平台补贴
-     */
-    private BigDecimal platformSubsidy;
-    public BigDecimal getPlatformSubsidy() {
-        return platformSubsidy;
-    }
-    public void setPlatformSubsidy(BigDecimal platformSubsidy) {
-        this.platformSubsidy = platformSubsidy;
-    }
-    
-    /**
-     * 菜品原价限制
-     */
-    private OFoodPriceLimit foodPriceLimit;
-    public OFoodPriceLimit getFoodPriceLimit() {
-        return foodPriceLimit;
-    }
-    public void setFoodPriceLimit(OFoodPriceLimit foodPriceLimit) {
-        this.foodPriceLimit = foodPriceLimit;
-    }
-    
-    /**
-     * 餐盒费限制
-     */
-    private BigDecimal packagePrice;
-    public BigDecimal getPackagePrice() {
-        return packagePrice;
-    }
-    public void setPackagePrice(BigDecimal packagePrice) {
-        this.packagePrice = packagePrice;
-    }
-    
-    /**
-     * 新品限制
-     */
-    private Boolean newProduct;
-    public Boolean getNewProduct() {
-        return newProduct;
-    }
-    public void setNewProduct(Boolean newProduct) {
-        this.newProduct = newProduct;
-    }
-    
-    /**
-     * 最高起送价限制
-     */
-    private BigDecimal maxStartDispatchPrice;
-    public BigDecimal getMaxStartDispatchPrice() {
-        return maxStartDispatchPrice;
-    }
-    public void setMaxStartDispatchPrice(BigDecimal maxStartDispatchPrice) {
-        this.maxStartDispatchPrice = maxStartDispatchPrice;
-    }
-    
-    /**
-     * 最高配送费限制
-     */
-    private BigDecimal maxDispatchPrice;
-    public BigDecimal getMaxDispatchPrice() {
-        return maxDispatchPrice;
-    }
-    public void setMaxDispatchPrice(BigDecimal maxDispatchPrice) {
-        this.maxDispatchPrice = maxDispatchPrice;
-    }
-    
-    /**
-     * 品类
-     */
-    private OCategoryType categoryTypeEnum;
-    public OCategoryType getCategoryTypeEnum() {
-        return categoryTypeEnum;
-    }
-    public void setCategoryTypeEnum(OCategoryType categoryTypeEnum) {
-        this.categoryTypeEnum = categoryTypeEnum;
-    }
-    
-    /**
-     * 报名日期
-     */
-    private OApplyDate applyDate;
-    public OApplyDate getApplyDate() {
-        return applyDate;
-    }
-    public void setApplyDate(OApplyDate applyDate) {
-        this.applyDate = applyDate;
-    }
-    
-    /**
-     * 活动日期及时间
-     */
-    private OActivityDateTime activityDateTime;
-    public OActivityDateTime getActivityDateTime() {
-        return activityDateTime;
-    }
-    public void setActivityDateTime(OActivityDateTime activityDateTime) {
-        this.activityDateTime = activityDateTime;
-    }
-    
-    /**
-     * 报名条件
-     */
-    private OShopApplyCondition shopApplyCondition;
-    public OShopApplyCondition getShopApplyCondition() {
-        return shopApplyCondition;
-    }
-    public void setShopApplyCondition(OShopApplyCondition shopApplyCondition) {
-        this.shopApplyCondition = shopApplyCondition;
-    }
-    
-    /**
-     * 生效条件
-     */
-    private OEffectiveCondition effectiveCondition;
-    public OEffectiveCondition getEffectiveCondition() {
-        return effectiveCondition;
-    }
-    public void setEffectiveCondition(OEffectiveCondition effectiveCondition) {
-        this.effectiveCondition = effectiveCondition;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OActivityFoodApplyResult.java

@@ -1,121 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OActivityFoodApplyResult{
-
-    /**
-     * 菜品Id
-     */
-    private Long itemId;
-    public Long getItemId() {
-        return itemId;
-    }
-    public void setItemId(Long itemId) {
-        this.itemId = itemId;
-    }
-    
-    /**
-     * 菜品名称
-     */
-    private String foodName;
-    public String getFoodName() {
-        return foodName;
-    }
-    public void setFoodName(String foodName) {
-        this.foodName = foodName;
-    }
-    
-    /**
-     * 分类Id
-     */
-    private Long categoryId;
-    public Long getCategoryId() {
-        return categoryId;
-    }
-    public void setCategoryId(Long categoryId) {
-        this.categoryId = categoryId;
-    }
-    
-    /**
-     * 菜品所属店铺Id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 菜品在活动中的状态
-     */
-    private OActivityFoodStatus activityFoodStatus;
-    public OActivityFoodStatus getActivityFoodStatus() {
-        return activityFoodStatus;
-    }
-    public void setActivityFoodStatus(OActivityFoodStatus activityFoodStatus) {
-        this.activityFoodStatus = activityFoodStatus;
-    }
-    
-    /**
-     * 活动库存
-     */
-    private OActivityFoodStock activityFoodStock;
-    public OActivityFoodStock getActivityFoodStock() {
-        return activityFoodStock;
-    }
-    public void setActivityFoodStock(OActivityFoodStock activityFoodStock) {
-        this.activityFoodStock = activityFoodStock;
-    }
-    
-    /**
-     * 菜品的审核状态
-     */
-    private OAuditStatus auditStatusEnum;
-    public OAuditStatus getAuditStatusEnum() {
-        return auditStatusEnum;
-    }
-    public void setAuditStatusEnum(OAuditStatus auditStatusEnum) {
-        this.auditStatusEnum = auditStatusEnum;
-    }
-    
-    /**
-     * 计算后的活动价格
-     */
-    private BigDecimal activityPrice;
-    public BigDecimal getActivityPrice() {
-        return activityPrice;
-    }
-    public void setActivityPrice(BigDecimal activityPrice) {
-        this.activityPrice = activityPrice;
-    }
-    
-    /**
-     * 上下架状态
-     */
-    private OSaleStatus saleStatus;
-    public OSaleStatus getSaleStatus() {
-        return saleStatus;
-    }
-    public void setSaleStatus(OSaleStatus saleStatus) {
-        this.saleStatus = saleStatus;
-    }
-    
-    /**
-     * 审核原因
-     */
-    private String auditComment;
-    public String getAuditComment() {
-        return auditComment;
-    }
-    public void setAuditComment(String auditComment) {
-        this.auditComment = auditComment;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OActivityFoodStock.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OActivityFoodStock{
-
-    /**
-     * 库存类型
-     */
-    private OStockType stockType;
-    public OStockType getStockType() {
-        return stockType;
-    }
-    public void setStockType(OStockType stockType) {
-        this.stockType = stockType;
-    }
-    
-    /**
-     * 最大库存（总库存）
-     */
-    private Integer maxStock;
-    public Integer getMaxStock() {
-        return maxStock;
-    }
-    public void setMaxStock(Integer maxStock) {
-        this.maxStock = maxStock;
-    }
-    
-    /**
-     * 每日库存
-     */
-    private Integer dailyStock;
-    public Integer getDailyStock() {
-        return dailyStock;
-    }
-    public void setDailyStock(Integer dailyStock) {
-        this.dailyStock = dailyStock;
-    }
-    
-    /**
-     * 当前活动库存
-     */
-    private Integer activityStock;
-    public Integer getActivityStock() {
-        return activityStock;
-    }
-    public void setActivityStock(Integer activityStock) {
-        this.activityStock = activityStock;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OActivityService.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OActivityService{
-
-    /**
-     * 结果
-     */
-    private Boolean result;
-    public Boolean getResult() {
-        return result;
-    }
-    public void setResult(Boolean result) {
-        this.result = result;
-    }
-    
-    /**
-     * 扣减额
-     */
-    private Double discounts;
-    public Double getDiscounts() {
-        return discounts;
-    }
-    public void setDiscounts(Double discounts) {
-        this.discounts = discounts;
-    }
-    
-    /**
-     * 每日库存
-     */
-    private Long dailyStock;
-    public Long getDailyStock() {
-        return dailyStock;
-    }
-    public void setDailyStock(Long dailyStock) {
-        this.dailyStock = dailyStock;
-    }
-    
-    /**
-     * 开通状态
-     */
-    private Boolean openStatus;
-    public Boolean getOpenStatus() {
-        return openStatus;
-    }
-    public void setOpenStatus(Boolean openStatus) {
-        this.openStatus = openStatus;
-    }
-    
-    /**
-     * 失败原因
-     */
-    private String reason;
-    public String getReason() {
-        return reason;
-    }
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OActivityServiceDetails.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OActivityServiceDetails{
-
-    /**
-     * 扣减额
-     */
-    private Double discounts;
-    public Double getDiscounts() {
-        return discounts;
-    }
-    public void setDiscounts(Double discounts) {
-        this.discounts = discounts;
-    }
-    
-    /**
-     * 每日库存
-     */
-    private Long dailyStock;
-    public Long getDailyStock() {
-        return dailyStock;
-    }
-    public void setDailyStock(Long dailyStock) {
-        this.dailyStock = dailyStock;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OActivityTime.java

@@ -1,35 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OActivityTime{
-
-    /**
-     * 每日开始时间
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date beginTime;
-    public Date getBeginTime() {
-        return beginTime;
-    }
-    public void setBeginTime(Date beginTime) {
-        this.beginTime = beginTime;
-    }
-    
-    /**
-     * 每日结束时间
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date endTime;
-    public Date getEndTime() {
-        return endTime;
-    }
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OApplyDate.java

@@ -1,35 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OApplyDate{
-
-    /**
-     * 报名开始日期
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date beginDate;
-    public Date getBeginDate() {
-        return beginDate;
-    }
-    public void setBeginDate(Date beginDate) {
-        this.beginDate = beginDate;
-    }
-    
-    /**
-     * 报名结束日期
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date endDate;
-    public Date getEndDate() {
-        return endDate;
-    }
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OCouponActivity.java

@@ -1,88 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OCouponActivity{
-
-    /**
-     * 店铺Id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 红包活动名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 红包活动类型
-     */
-    private CouponActivityType type;
-    public CouponActivityType getType() {
-        return type;
-    }
-    public void setType(CouponActivityType type) {
-        this.type = type;
-    }
-    
-    /**
-     * 红包优惠
-     */
-    private CouponBenefit benefit;
-    public CouponBenefit getBenefit() {
-        return benefit;
-    }
-    public void setBenefit(CouponBenefit benefit) {
-        this.benefit = benefit;
-    }
-    
-    /**
-     * 红包活动条件
-     */
-    private Condition condition;
-    public Condition getCondition() {
-        return condition;
-    }
-    public void setCondition(Condition condition) {
-        this.condition = condition;
-    }
-    
-    /**
-     * 红包券活动Id
-     */
-    private Long couponActivityId;
-    public Long getCouponActivityId() {
-        return couponActivityId;
-    }
-    public void setCouponActivityId(Long couponActivityId) {
-        this.couponActivityId = couponActivityId;
-    }
-    
-    /**
-     * 红包活动状态
-     */
-    private OActivityStatus activityStatus;
-    public OActivityStatus getActivityStatus() {
-        return activityStatus;
-    }
-    public void setActivityStatus(OActivityStatus activityStatus) {
-        this.activityStatus = activityStatus;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OEffectiveCondition.java

@@ -1,77 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OEffectiveCondition{
-
-    /**
-     * 新用户
-     */
-    private Boolean newUser;
-    public Boolean getNewUser() {
-        return newUser;
-    }
-    public void setNewUser(Boolean newUser) {
-        this.newUser = newUser;
-    }
-    
-    /**
-     * 仅在线支付
-     */
-    private Boolean onlinePayment;
-    public Boolean getOnlinePayment() {
-        return onlinePayment;
-    }
-    public void setOnlinePayment(Boolean onlinePayment) {
-        this.onlinePayment = onlinePayment;
-    }
-    
-    /**
-     * 饿了么会员
-     */
-    private Boolean elemeVip;
-    public Boolean getElemeVip() {
-        return elemeVip;
-    }
-    public void setElemeVip(Boolean elemeVip) {
-        this.elemeVip = elemeVip;
-    }
-    
-    /**
-     * 与美食活动同享
-     */
-    private Boolean shareWithSkuActivity;
-    public Boolean getShareWithSkuActivity() {
-        return shareWithSkuActivity;
-    }
-    public void setShareWithSkuActivity(Boolean shareWithSkuActivity) {
-        this.shareWithSkuActivity = shareWithSkuActivity;
-    }
-    
-    /**
-     * 与店铺活动同享
-     */
-    private Boolean shareWithShopActivity;
-    public Boolean getShareWithShopActivity() {
-        return shareWithShopActivity;
-    }
-    public void setShareWithShopActivity(Boolean shareWithShopActivity) {
-        this.shareWithShopActivity = shareWithShopActivity;
-    }
-    
-    /**
-     * 和其它活动同享
-     */
-    private Boolean shareWithOthers;
-    public Boolean getShareWithOthers() {
-        return shareWithOthers;
-    }
-    public void setShareWithOthers(Boolean shareWithOthers) {
-        this.shareWithOthers = shareWithOthers;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OFoodPriceLimit.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OFoodPriceLimit{
-
-    /**
-     * 菜品原价最低限制
-     */
-    private BigDecimal minPrice;
-    public BigDecimal getMinPrice() {
-        return minPrice;
-    }
-    public void setMinPrice(BigDecimal minPrice) {
-        this.minPrice = minPrice;
-    }
-    
-    /**
-     * 菜品原价最高限制
-     */
-    private BigDecimal maxPrice;
-    public BigDecimal getMaxPrice() {
-        return maxPrice;
-    }
-    public void setMaxPrice(BigDecimal maxPrice) {
-        this.maxPrice = maxPrice;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OFoodQuantityLimit.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OFoodQuantityLimit{
-
-    /**
-     * 菜品的最小数量限制
-     */
-    private Integer minLimit;
-    public Integer getMinLimit() {
-        return minLimit;
-    }
-    public void setMinLimit(Integer minLimit) {
-        this.minLimit = minLimit;
-    }
-    
-    /**
-     * 报名菜品的最大数量限制
-     */
-    private Integer maxLimit;
-    public Integer getMaxLimit() {
-        return maxLimit;
-    }
-    public void setMaxLimit(Integer maxLimit) {
-        this.maxLimit = maxLimit;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OFoodStockLimit.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OFoodStockLimit{
-
-    /**
-     * 菜品库存类型
-     */
-    private OFoodStockType foodStockTypeEnum;
-    public OFoodStockType getFoodStockTypeEnum() {
-        return foodStockTypeEnum;
-    }
-    public void setFoodStockTypeEnum(OFoodStockType foodStockTypeEnum) {
-        this.foodStockTypeEnum = foodStockTypeEnum;
-    }
-    
-    /**
-     * 总库存
-     */
-    private Integer allStock;
-    public Integer getAllStock() {
-        return allStock;
-    }
-    public void setAllStock(Integer allStock) {
-        this.allStock = allStock;
-    }
-    
-    /**
-     * 每日最小库存
-     */
-    private Integer minStock;
-    public Integer getMinStock() {
-        return minStock;
-    }
-    public void setMinStock(Integer minStock) {
-        this.minStock = minStock;
-    }
-    
-    /**
-     * 每日最大库存
-     */
-    private Integer maxStock;
-    public Integer getMaxStock() {
-        return maxStock;
-    }
-    public void setMaxStock(Integer maxStock) {
-        this.maxStock = maxStock;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OShopApplyCondition.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OShopApplyCondition{
-
-    /**
-     * 所有商户能报名
-     */
-    private Boolean allShopCanApply;
-    public Boolean getAllShopCanApply() {
-        return allShopCanApply;
-    }
-    public void setAllShopCanApply(Boolean allShopCanApply) {
-        this.allShopCanApply = allShopCanApply;
-    }
-    
-    /**
-     * 星火计划商户能报名
-     */
-    private Boolean sparkShopCanApply;
-    public Boolean getSparkShopCanApply() {
-        return sparkShopCanApply;
-    }
-    public void setSparkShopCanApply(Boolean sparkShopCanApply) {
-        this.sparkShopCanApply = sparkShopCanApply;
-    }
-    
-    /**
-     * 蜂鸟商户能报名
-     */
-    private Boolean beeBirdShopCanApply;
-    public Boolean getBeeBirdShopCanApply() {
-        return beeBirdShopCanApply;
-    }
-    public void setBeeBirdShopCanApply(Boolean beeBirdShopCanApply) {
-        this.beeBirdShopCanApply = beeBirdShopCanApply;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OrderSubsidyActivity.java

@@ -1,88 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OrderSubsidyActivity{
-
-    /**
-     * 活动参与关系id
-     */
-    private Long id;
-    public Long getId() {
-        return id;
-    }
-    public void setId(Long id) {
-        this.id = id;
-    }
-    
-    /**
-     * 若为单品活动、部分商品满减活动，则返回命中的sku_id，其他店铺活动不返回
-     */
-    private List<Long> skuIds;
-    public List<Long> getSkuIds() {
-        return skuIds;
-    }
-    public void setSkuIds(List<Long> skuIds) {
-        this.skuIds = skuIds;
-    }
-    
-    /**
-     * 活动模板id
-     */
-    private Long metaId;
-    public Long getMetaId() {
-        return metaId;
-    }
-    public void setMetaId(Long metaId) {
-        this.metaId = metaId;
-    }
-    
-    /**
-     * 活动名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 活动大类：单品活动(11)、店铺活动(12)、限量抢购(200)
-     */
-    private Integer categoryId;
-    public Integer getCategoryId() {
-        return categoryId;
-    }
-    public void setCategoryId(Integer categoryId) {
-        this.categoryId = categoryId;
-    }
-    
-    /**
-     * 活动细分类型：满减、满赠等
-     */
-    private Integer type;
-    public Integer getType() {
-        return type;
-    }
-    public void setType(Integer type) {
-        this.type = type;
-    }
-    
-    /**
-     * 补贴细节
-     */
-    private List<SubsidyPart> subsidy;
-    public List<SubsidyPart> getSubsidy() {
-        return subsidy;
-    }
-    public void setSubsidy(List<SubsidyPart> subsidy) {
-        this.subsidy = subsidy;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OrderSubsidyCoupon.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OrderSubsidyCoupon{
-
-    /**
-     * 券id
-     */
-    private Long couponId;
-    public Long getCouponId() {
-        return couponId;
-    }
-    public void setCouponId(Long couponId) {
-        this.couponId = couponId;
-    }
-    
-    /**
-     * 券所属活动ID，没有关联活动为0
-     */
-    private Long activityId;
-    public Long getActivityId() {
-        return activityId;
-    }
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-    
-    /**
-     * 券名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 若为单品券、部分商品满减券，则返回命中的sku_id，其他券不返回
-     */
-    private List<Long> skuIds;
-    public List<Long> getSkuIds() {
-        return skuIds;
-    }
-    public void setSkuIds(List<Long> skuIds) {
-        this.skuIds = skuIds;
-    }
-    
-    /**
-     * 补贴细节
-     */
-    private List<SubsidyPart> subsidy;
-    public List<SubsidyPart> getSubsidy() {
-        return subsidy;
-    }
-    public void setSubsidy(List<SubsidyPart> subsidy) {
-        this.subsidy = subsidy;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OrderSubsidyHongbao.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OrderSubsidyHongbao{
-
-    /**
-     * 红包id
-     */
-    private Long hongbaoId;
-    public Long getHongbaoId() {
-        return hongbaoId;
-    }
-    public void setHongbaoId(Long hongbaoId) {
-        this.hongbaoId = hongbaoId;
-    }
-    
-    /**
-     * 红包名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 补贴细节
-     */
-    private List<SubsidyPart> subsidy;
-    public List<SubsidyPart> getSubsidy() {
-        return subsidy;
-    }
-    public void setSubsidy(List<SubsidyPart> subsidy) {
-        this.subsidy = subsidy;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OrderSubsidyResult.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OrderSubsidyResult{
-
-    /**
-     * 活动相关列表
-     */
-    private List<OrderSubsidyActivity> activities;
-    public List<OrderSubsidyActivity> getActivities() {
-        return activities;
-    }
-    public void setActivities(List<OrderSubsidyActivity> activities) {
-        this.activities = activities;
-    }
-    
-    /**
-     * 红包相关列表
-     */
-    private List<OrderSubsidyHongbao> hongbaos;
-    public List<OrderSubsidyHongbao> getHongbaos() {
-        return hongbaos;
-    }
-    public void setHongbaos(List<OrderSubsidyHongbao> hongbaos) {
-        this.hongbaos = hongbaos;
-    }
-    
-    /**
-     * 券相关列表
-     */
-    private List<OrderSubsidyCoupon> coupons;
-    public List<OrderSubsidyCoupon> getCoupons() {
-        return coupons;
-    }
-    public void setCoupons(List<OrderSubsidyCoupon> coupons) {
-        this.coupons = coupons;
-    }
-    
-    /**
-     * 星选餐饮券相关列表
-     */
-    private List<OrderSubsidyStarCoupon> starCoupons;
-    public List<OrderSubsidyStarCoupon> getStarCoupons() {
-        return starCoupons;
-    }
-    public void setStarCoupons(List<OrderSubsidyStarCoupon> starCoupons) {
-        this.starCoupons = starCoupons;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/OrderSubsidyStarCoupon.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OrderSubsidyStarCoupon{
-
-    /**
-     * 券名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 补贴细节
-     */
-    private List<SubsidyPart> subsidy;
-    public List<SubsidyPart> getSubsidy() {
-        return subsidy;
-    }
-    public void setSubsidy(List<SubsidyPart> subsidy) {
-        this.subsidy = subsidy;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/PresentWithTemplateModel.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class PresentWithTemplateModel{
-
-    /**
-     * 活动模板id
-     */
-    private Long templateId;
-    public Long getTemplateId() {
-        return templateId;
-    }
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-    
-    /**
-     * 店铺id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 目标类型
-     */
-    private TargetListType targetListType;
-    public TargetListType getTargetListType() {
-        return targetListType;
-    }
-    public void setTargetListType(TargetListType targetListType) {
-        this.targetListType = targetListType;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/PresentWithTemplateResult.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class PresentWithTemplateResult{
-
-    /**
-     * 发券结果
-     */
-    private Map<String,PresentWithTemplateSingleResult> presentWithTemplateSingleResults;
-    public Map<String,PresentWithTemplateSingleResult> getPresentWithTemplateSingleResults() {
-        return presentWithTemplateSingleResults;
-    }
-    public void setPresentWithTemplateSingleResults(Map<String,PresentWithTemplateSingleResult> presentWithTemplateSingleResults) {
-        this.presentWithTemplateSingleResults = presentWithTemplateSingleResults;
-    }
-    
-    /**
-     * 券id
-     */
-    private Long couponId;
-    public Long getCouponId() {
-        return couponId;
-    }
-    public void setCouponId(Long couponId) {
-        this.couponId = couponId;
-    }
-    
-    /**
-     * 创建活动是否成功
-     */
-    private Boolean success;
-    public Boolean getSuccess() {
-        return success;
-    }
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-    
-    /**
-     * 失败原因
-     */
-    private String reason;
-    public String getReason() {
-        return reason;
-    }
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-    
-    /**
-     * 异常code
-     */
-    private String errorCode;
-    public String getErrorCode() {
-        return errorCode;
-    }
-    public void setErrorCode(String errorCode) {
-        this.errorCode = errorCode;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/PresentWithTemplateSingleResult.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class PresentWithTemplateSingleResult{
-
-    /**
-     * 执行结果
-     */
-    private Boolean success;
-    public Boolean getSuccess() {
-        return success;
-    }
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-    
-    /**
-     * 券id
-     */
-    private String couponId;
-    public String getCouponId() {
-        return couponId;
-    }
-    public void setCouponId(String couponId) {
-        this.couponId = couponId;
-    }
-    
-    /**
-     * 失败原因
-     */
-    private String reason;
-    public String getReason() {
-        return reason;
-    }
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-    
-    /**
-     * 异常code
-     */
-    private String errorCode;
-    public String getErrorCode() {
-        return errorCode;
-    }
-    public void setErrorCode(String errorCode) {
-        this.errorCode = errorCode;
-    }
-    
-    /**
-     * 入参的电话或用户id
-     */
-    private String target;
-    public String getTarget() {
-        return target;
-    }
-    public void setTarget(String target) {
-        this.target = target;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/QueryTemplateResult.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class QueryTemplateResult{
-
-    /**
-     * 活动模板详情
-     */
-    private ActivityTemplateDetail activityTemplateDetail;
-    public ActivityTemplateDetail getActivityTemplateDetail() {
-        return activityTemplateDetail;
-    }
-    public void setActivityTemplateDetail(ActivityTemplateDetail activityTemplateDetail) {
-        this.activityTemplateDetail = activityTemplateDetail;
-    }
-    
-    /**
-     * 创建活动是否成功
-     */
-    private Boolean success;
-    public Boolean getSuccess() {
-        return success;
-    }
-    public void setSuccess(Boolean success) {
-        this.success = success;
-    }
-    
-    /**
-     * 失败原因
-     */
-    private String reason;
-    public String getReason() {
-        return reason;
-    }
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-    
-    /**
-     * 异常code
-     */
-    private String errorCode;
-    public String getErrorCode() {
-        return errorCode;
-    }
-    public void setErrorCode(String errorCode) {
-        this.errorCode = errorCode;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ReceiveRule.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ReceiveRule{
-
-    /**
-     * 红包的领取类型（每人一张,每人每天一张）
-     */
-    private CouponReceiveType type;
-    public CouponReceiveType getType() {
-        return type;
-    }
-    public void setType(CouponReceiveType type) {
-        this.type = type;
-    }
-    
-    /**
-     * 红包的领取数量（暂时只支持每次领取一张）
-     */
-    private Integer quantity;
-    public Integer getQuantity() {
-        return quantity;
-    }
-    public void setQuantity(Integer quantity) {
-        this.quantity = quantity;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ReceivedCouponDetail.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ReceivedCouponDetail{
-
-    /**
-     * 店铺已发券的数量
-     */
-    private Integer giveOutCount;
-    public Integer getGiveOutCount() {
-        return giveOutCount;
-    }
-    public void setGiveOutCount(Integer giveOutCount) {
-        this.giveOutCount = giveOutCount;
-    }
-    
-    /**
-     * 红包领取详情列表
-     */
-    private List<CouponUsedInfo> couponUsedInfos;
-    public List<CouponUsedInfo> getCouponUsedInfos() {
-        return couponUsedInfos;
-    }
-    public void setCouponUsedInfos(List<CouponUsedInfo> couponUsedInfos) {
-        this.couponUsedInfos = couponUsedInfos;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/SActivityDate.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class SActivityDate{
-
-    /**
-     * 活动开始日期
-     */
-    private String beginDate;
-    public String getBeginDate() {
-        return beginDate;
-    }
-    public void setBeginDate(String beginDate) {
-        this.beginDate = beginDate;
-    }
-    
-    /**
-     * 活动结束日期
-     */
-    private String endDate;
-    public String getEndDate() {
-        return endDate;
-    }
-    public void setEndDate(String endDate) {
-        this.endDate = endDate;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/SActivityTime.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class SActivityTime{
-
-    /**
-     * 每日开始时间
-     */
-    private String beginTime;
-    public String getBeginTime() {
-        return beginTime;
-    }
-    public void setBeginTime(String beginTime) {
-        this.beginTime = beginTime;
-    }
-    
-    /**
-     * 每日结束时间
-     */
-    private String endTime;
-    public String getEndTime() {
-        return endTime;
-    }
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ServiceResult.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ServiceResult{
-
-    /**
-     * 餐厅id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 结果
-     */
-    private Boolean result;
-    public Boolean getResult() {
-        return result;
-    }
-    public void setResult(Boolean result) {
-        this.result = result;
-    }
-    
-    /**
-     * 失败原因
-     */
-    private String reason;
-    public String getReason() {
-        return reason;
-    }
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/ShippingFeeActivityCreateInfo.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ShippingFeeActivityCreateInfo{
-
-    /**
-     * 配送费减免金额
-     */
-    private float reductionValue;
-    public float getReductionValue() {
-        return reductionValue;
-    }
-    public void setReductionValue(float reductionValue) {
-        this.reductionValue = reductionValue;
-    }
-    
-    /**
-     * 活动生效时间区间信息
-     */
-    private ActivityDateTime effectivePeriod;
-    public ActivityDateTime getEffectivePeriod() {
-        return effectivePeriod;
-    }
-    public void setEffectivePeriod(ActivityDateTime effectivePeriod) {
-        this.effectivePeriod = effectivePeriod;
-    }
-    
-    /**
-     * 标品Id
-     */
-    private Long standardId;
-    public Long getStandardId() {
-        return standardId;
-    }
-    public void setStandardId(Long standardId) {
-        this.standardId = standardId;
-    }
-    
-    /**
-     * 标品类型
-     */
-    private int standardType;
-    public int getStandardType() {
-        return standardType;
-    }
-    public void setStandardType(int standardType) {
-        this.standardType = standardType;
-    }
-    
-    /**
-     * 标品名称
-     */
-    private String standardName;
-    public String getStandardName() {
-        return standardName;
-    }
-    public void setStandardName(String standardName) {
-        this.standardName = standardName;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/SkuActivityFoodApplyInfo.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class SkuActivityFoodApplyInfo{
-
-    /**
-     * 商品规格Id
-     */
-    private Long specId;
-    public Long getSpecId() {
-        return specId;
-    }
-    public void setSpecId(Long specId) {
-        this.specId = specId;
-    }
-    
-    /**
-     * 报名的商品的库存
-     */
-    private Integer stock;
-    public Integer getStock() {
-        return stock;
-    }
-    public void setStock(Integer stock) {
-        this.stock = stock;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/SkuActivityFoodDetail.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class SkuActivityFoodDetail{
-
-    /**
-     * 活动Id
-     */
-    private Long activityId;
-    public Long getActivityId() {
-        return activityId;
-    }
-    public void setActivityId(Long activityId) {
-        this.activityId = activityId;
-    }
-    
-    /**
-     * 活动参与关系
-     */
-    private List<ActivityFoodRelation> relations;
-    public List<ActivityFoodRelation> getRelations() {
-        return relations;
-    }
-    public void setRelations(List<ActivityFoodRelation> relations) {
-        this.relations = relations;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/SkuActivityShopApplyInfoDTO.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class SkuActivityShopApplyInfoDTO{
-
-    /**
-     * 报名的店铺Id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-    /**
-     * 报名的商品
-     */
-    private List<SkuActivityFoodApplyInfo> foods;
-    public List<SkuActivityFoodApplyInfo> getFoods() {
-        return foods;
-    }
-    public void setFoods(List<SkuActivityFoodApplyInfo> foods) {
-        this.foods = foods;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/SkuActivityStockDTO.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class SkuActivityStockDTO{
-
-    /**
-     * 库存类型
-     */
-    private StockTypeEnum stockType;
-    public StockTypeEnum getStockType() {
-        return stockType;
-    }
-    public void setStockType(StockTypeEnum stockType) {
-        this.stockType = stockType;
-    }
-    
-    /**
-     * 库存数量
-     */
-    private Integer stock;
-    public Integer getStock() {
-        return stock;
-    }
-    public void setStock(Integer stock) {
-        this.stock = stock;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/SkuCouponDetail.java

@@ -1,77 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class SkuCouponDetail{
-
-    /**
-     * 优惠内容
-     */
-    private Double content;
-    public Double getContent() {
-        return content;
-    }
-    public void setContent(Double content) {
-        this.content = content;
-    }
-    
-    /**
-     * 优惠券名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 优惠类型
-     */
-    private Integer benefitTyp;
-    public Integer getBenefitTyp() {
-        return benefitTyp;
-    }
-    public void setBenefitTyp(Integer benefitTyp) {
-        this.benefitTyp = benefitTyp;
-    }
-    
-    /**
-     * 券有效期
-     */
-    private Long duration;
-    public Long getDuration() {
-        return duration;
-    }
-    public void setDuration(Long duration) {
-        this.duration = duration;
-    }
-    
-    /**
-     * 商品规格编号
-     */
-    private Long specId;
-    public Long getSpecId() {
-        return specId;
-    }
-    public void setSpecId(Long specId) {
-        this.specId = specId;
-    }
-    
-    /**
-     * 店铺id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/SkuPriceActivityDTO.java

@@ -1,110 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class SkuPriceActivityDTO{
-
-    /**
-     * 第N份商品优惠(不能小于1)
-     */
-    private Integer condition;
-    public Integer getCondition() {
-        return condition;
-    }
-    public void setCondition(Integer condition) {
-        this.condition = condition;
-    }
-    
-    /**
-     * 是否每份商品优惠(1:是 0:不是)
-     */
-    private Integer conditionType;
-    public Integer getConditionType() {
-        return conditionType;
-    }
-    public void setConditionType(Integer conditionType) {
-        this.conditionType = conditionType;
-    }
-    
-    /**
-     * 活动价格
-     */
-    private BigDecimal benefit;
-    public BigDecimal getBenefit() {
-        return benefit;
-    }
-    public void setBenefit(BigDecimal benefit) {
-        this.benefit = benefit;
-    }
-    
-    /**
-     * 库存属性
-     */
-    private SkuActivityStockDTO stockDTO;
-    public SkuActivityStockDTO getStockDTO() {
-        return stockDTO;
-    }
-    public void setStockDTO(SkuActivityStockDTO stockDTO) {
-        this.stockDTO = stockDTO;
-    }
-    
-    /**
-     * 活动名称
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 活动内容描述
-     */
-    private String description;
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    
-    /**
-     * 活动icon
-     */
-    private Icon icon;
-    public Icon getIcon() {
-        return icon;
-    }
-    public void setIcon(Icon icon) {
-        this.icon = icon;
-    }
-    
-    /**
-     * 活动生效时间区间信息
-     */
-    private ActivityDateTime activityTime;
-    public ActivityDateTime getActivityTime() {
-        return activityTime;
-    }
-    public void setActivityTime(ActivityDateTime activityTime) {
-        this.activityTime = activityTime;
-    }
-    
-    /**
-     * 每单限购只能是1
-     */
-    private Integer effectTimes;
-    public Integer getEffectTimes() {
-        return effectTimes;
-    }
-    public void setEffectTimes(Integer effectTimes) {
-        this.effectTimes = effectTimes;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/SubsidyPart.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class SubsidyPart{
-
-    /**
-     * 补贴名称
-     */
-    private String partName;
-    public String getPartName() {
-        return partName;
-    }
-    public void setPartName(String partName) {
-        this.partName = partName;
-    }
-    
-    /**
-     * 补贴金额
-     */
-    private Double partAmount;
-    public Double getPartAmount() {
-        return partAmount;
-    }
-    public void setPartAmount(Double partAmount) {
-        this.partAmount = partAmount;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/TargetCouponDetail.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class TargetCouponDetail{
-
-    /**
-     * 门槛
-     */
-    private Long threshold;
-    public Long getThreshold() {
-        return threshold;
-    }
-    public void setThreshold(Long threshold) {
-        this.threshold = threshold;
-    }
-    
-    /**
-     * 扣减额
-     */
-    private Double discounts;
-    public Double getDiscounts() {
-        return discounts;
-    }
-    public void setDiscounts(Double discounts) {
-        this.discounts = discounts;
-    }
-    
-    /**
-     * 有效期
-     */
-    private Long duration;
-    public Long getDuration() {
-        return duration;
-    }
-    public void setDuration(Long duration) {
-        this.duration = duration;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/TargetCouponInfo.java

@@ -1,89 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class TargetCouponInfo{
-
-    /**
-     * 红包id
-     */
-    private String couponId;
-    public String getCouponId() {
-        return couponId;
-    }
-    public void setCouponId(String couponId) {
-        this.couponId = couponId;
-    }
-    
-    /**
-     * 红包状态
-     */
-    private CouponStatus status;
-    public CouponStatus getStatus() {
-        return status;
-    }
-    public void setStatus(CouponStatus status) {
-        this.status = status;
-    }
-    
-    /**
-     * 红包的用户id
-     */
-    private String userId;
-    public String getUserId() {
-        return userId;
-    }
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-    
-    /**
-     * 红包的连锁店id
-     */
-    private Long chainId;
-    public Long getChainId() {
-        return chainId;
-    }
-    public void setChainId(Long chainId) {
-        this.chainId = chainId;
-    }
-    
-    /**
-     * 使用红包的时间
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date useTime;
-    public Date getUseTime() {
-        return useTime;
-    }
-    public void setUseTime(Date useTime) {
-        this.useTime = useTime;
-    }
-    
-    /**
-     * 使用红包的订单id
-     */
-    private String orderId;
-    public String getOrderId() {
-        return orderId;
-    }
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-    
-    /**
-     * 使用红包的店铺id
-     */
-    private Long shopId;
-    public Long getShopId() {
-        return shopId;
-    }
-    public void setShopId(Long shopId) {
-        this.shopId = shopId;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/TargetCouponQueryRequest.java

@@ -1,79 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class TargetCouponQueryRequest{
-
-    /**
-     * id
-     */
-    private Long Id;
-    public Long getId() {
-        return Id;
-    }
-    public void setId(Long Id) {
-        this.Id = Id;
-    }
-    
-    /**
-     * id类型
-     */
-    private IdType idType;
-    public IdType getIdType() {
-        return idType;
-    }
-    public void setIdType(IdType idType) {
-        this.idType = idType;
-    }
-    
-    /**
-     * 当前页号
-     */
-    private Integer currentPage;
-    public Integer getCurrentPage() {
-        return currentPage;
-    }
-    public void setCurrentPage(Integer currentPage) {
-        this.currentPage = currentPage;
-    }
-    
-    /**
-     * 页大小
-     */
-    private Integer pageSize;
-    public Integer getPageSize() {
-        return pageSize;
-    }
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-    
-    /**
-     * 查询赠红包时间始点
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date beginTime;
-    public Date getBeginTime() {
-        return beginTime;
-    }
-    public void setBeginTime(Date beginTime) {
-        this.beginTime = beginTime;
-    }
-    
-    /**
-     * 查询赠红包时间终点
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date endTime;
-    public Date getEndTime() {
-        return endTime;
-    }
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/activity/TargetCouponResult.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.activity;
-
-import com.ydd.third.waimai.eleme.api.enumeration.activity.*;
-import com.ydd.third.waimai.eleme.api.entity.activity.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class TargetCouponResult{
-
-    /**
-     * 用户id
-     */
-    private String userId;
-    public String getUserId() {
-        return userId;
-    }
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-    
-    /**
-     * 手机号码
-     */
-    private String telephoneNumber;
-    public String getTelephoneNumber() {
-        return telephoneNumber;
-    }
-    public void setTelephoneNumber(String telephoneNumber) {
-        this.telephoneNumber = telephoneNumber;
-    }
-    
-    /**
-     * 执行结果
-     */
-    private Boolean result;
-    public Boolean getResult() {
-        return result;
-    }
-    public void setResult(Boolean result) {
-        this.result = result;
-    }
-    
-    /**
-     * 券id
-     */
-    private String couponId;
-    public String getCouponId() {
-        return couponId;
-    }
-    public void setCouponId(String couponId) {
-        this.couponId = couponId;
-    }
-    
-    /**
-     * 失败原因
-     */
-    private String reason;
-    public String getReason() {
-        return reason;
-    }
-    public void setReason(String reason) {
-        this.reason = reason;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/AccountInfo.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class AccountInfo{
-
-    /**
-     * 账户code
-     */
-    private AccountCode accountCode;
-    public AccountCode getAccountCode() {
-        return accountCode;
-    }
-    public void setAccountCode(AccountCode accountCode) {
-        this.accountCode = accountCode;
-    }
-    
-    /**
-     * 账户值
-     */
-    private String value;
-    public String getValue() {
-        return value;
-    }
-    public void setValue(String value) {
-        this.value = value;
-    }
-    
-    /**
-     * 账户url跳转
-     */
-    private String url;
-    public String getUrl() {
-        return url;
-    }
-    public void setUrl(String url) {
-        this.url = url;
-    }
-    
-    /**
-     * icon
-     */
-    private String iconHash;
-    public String getIconHash() {
-        return iconHash;
-    }
-    public void setIconHash(String iconHash) {
-        this.iconHash = iconHash;
-    }
-    
-    /**
-     * 单位
-     */
-    private String unit;
-    public String getUnit() {
-        return unit;
-    }
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/BenefitInfo.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class BenefitInfo{
-
-    /**
-     * 标题
-     */
-    private String title;
-    public String getTitle() {
-        return title;
-    }
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    
-    /**
-     * 文案
-     */
-    private String content;
-    public String getContent() {
-        return content;
-    }
-    public void setContent(String content) {
-        this.content = content;
-    }
-    
-    /**
-     * iconHash
-     */
-    private String iconHash;
-    public String getIconHash() {
-        return iconHash;
-    }
-    public void setIconHash(String iconHash) {
-        this.iconHash = iconHash;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/CardAccountInfo.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CardAccountInfo{
-
-    /**
-     * 积分
-     */
-    private String point;
-    public String getPoint() {
-        return point;
-    }
-    public void setPoint(String point) {
-        this.point = point;
-    }
-    
-    /**
-     * 余额
-     */
-    private String balance;
-    public String getBalance() {
-        return balance;
-    }
-    public void setBalance(String balance) {
-        this.balance = balance;
-    }
-    
-    /**
-     * 优惠券
-     */
-    private String ticketNum;
-    public String getTicketNum() {
-        return ticketNum;
-    }
-    public void setTicketNum(String ticketNum) {
-        this.ticketNum = ticketNum;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/CardUserInfo.java

@@ -1,121 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CardUserInfo{
-
-    /**
-     * 饿了么用户id
-     */
-    private Long elemeUserId;
-    public Long getElemeUserId() {
-        return elemeUserId;
-    }
-    public void setElemeUserId(Long elemeUserId) {
-        this.elemeUserId = elemeUserId;
-    }
-    
-    /**
-     * 姓名
-     */
-    private String name;
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * 性别
-     */
-    private String gender;
-    public String getGender() {
-        return gender;
-    }
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-    
-    /**
-     * 手机号
-     */
-    private String mobile;
-    public String getMobile() {
-        return mobile;
-    }
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-    
-    /**
-     * 生日
-     */
-    private String birth;
-    public String getBirth() {
-        return birth;
-    }
-    public void setBirth(String birth) {
-        this.birth = birth;
-    }
-    
-    /**
-     * 饿了么卡号
-     */
-    private String elemeCardNo;
-    public String getElemeCardNo() {
-        return elemeCardNo;
-    }
-    public void setElemeCardNo(String elemeCardNo) {
-        this.elemeCardNo = elemeCardNo;
-    }
-    
-    /**
-     * 业务会员卡号
-     */
-    private String externalCardNo;
-    public String getExternalCardNo() {
-        return externalCardNo;
-    }
-    public void setExternalCardNo(String externalCardNo) {
-        this.externalCardNo = externalCardNo;
-    }
-    
-    /**
-     * 开卡来源，默认为饿了么
-     */
-    private Integer openCardSource;
-    public Integer getOpenCardSource() {
-        return openCardSource;
-    }
-    public void setOpenCardSource(Integer openCardSource) {
-        this.openCardSource = openCardSource;
-    }
-    
-    /**
-     * 开卡日期
-     */
-    private String openDate;
-    public String getOpenDate() {
-        return openDate;
-    }
-    public void setOpenDate(String openDate) {
-        this.openDate = openDate;
-    }
-    
-    /**
-     * 有效日期
-     */
-    private String validDate;
-    public String getValidDate() {
-        return validDate;
-    }
-    public void setValidDate(String validDate) {
-        this.validDate = validDate;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/ColumnInfo.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ColumnInfo{
-
-    /**
-     * 列code
-     */
-    private ColumnCode columnCode;
-    public ColumnCode getColumnCode() {
-        return columnCode;
-    }
-    public void setColumnCode(ColumnCode columnCode) {
-        this.columnCode = columnCode;
-    }
-    
-    /**
-     * 标题
-     */
-    private String title;
-    public String getTitle() {
-        return title;
-    }
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    
-    /**
-     * desc
-     */
-    private String desc;
-    public String getDesc() {
-        return desc;
-    }
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-    
-    /**
-     * icon
-     */
-    private String iconHash;
-    public String getIconHash() {
-        return iconHash;
-    }
-    public void setIconHash(String iconHash) {
-        this.iconHash = iconHash;
-    }
-    
-    /**
-     * 跳转地址
-     */
-    private String url;
-    public String getUrl() {
-        return url;
-    }
-    public void setUrl(String url) {
-        this.url = url;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/CouponRequest.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class CouponRequest{
-
-    /**
-     * 请求发券信息
-     */
-    private UserCouponInfo userCouponInfo;
-    public UserCouponInfo getUserCouponInfo() {
-        return userCouponInfo;
-    }
-    public void setUserCouponInfo(UserCouponInfo userCouponInfo) {
-        this.userCouponInfo = userCouponInfo;
-    }
-    
-    /**
-     * 是否确认发券
-     */
-    private boolean confirmSend;
-    public boolean getConfirmSend() {
-        return confirmSend;
-    }
-    public void setConfirmSend(boolean confirmSend) {
-        this.confirmSend = confirmSend;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/FormData.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class FormData{
-
-    /**
-     * 类型
-     */
-    private FieldType fieldType;
-    public FieldType getFieldType() {
-        return fieldType;
-    }
-    public void setFieldType(FieldType fieldType) {
-        this.fieldType = fieldType;
-    }
-    
-    /**
-     * 提示文案
-     */
-    private String placeholder;
-    public String getPlaceholder() {
-        return placeholder;
-    }
-    public void setPlaceholder(String placeholder) {
-        this.placeholder = placeholder;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/FormInfo.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class FormInfo{
-
-    /**
-     * 必填项
-     */
-    private List<FormData> required;
-    public List<FormData> getRequired() {
-        return required;
-    }
-    public void setRequired(List<FormData> required) {
-        this.required = required;
-    }
-    
-    /**
-     * 可选项
-     */
-    private List<FormData> optional;
-    public List<FormData> getOptional() {
-        return optional;
-    }
-    public void setOptional(List<FormData> optional) {
-        this.optional = optional;
-    }
-    
-    /**
-     * 开卡成功跳转地址
-     */
-    private String callbackUrl;
-    public String getCallbackUrl() {
-        return callbackUrl;
-    }
-    public void setCallbackUrl(String callbackUrl) {
-        this.callbackUrl = callbackUrl;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/TemplateInfo.java

@@ -1,165 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class TemplateInfo{
-
-    /**
-     * 模板类型
-     */
-    private TemplateType templateType;
-    public TemplateType getTemplateType() {
-        return templateType;
-    }
-    public void setTemplateType(TemplateType templateType) {
-        this.templateType = templateType;
-    }
-    
-    /**
-     * 模板名称
-     */
-    private String templateName;
-    public String getTemplateName() {
-        return templateName;
-    }
-    public void setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-    
-    /**
-     * 会员卡名称
-     */
-    private String cardName;
-    public String getCardName() {
-        return cardName;
-    }
-    public void setCardName(String cardName) {
-        this.cardName = cardName;
-    }
-    
-    /**
-     * 条码类型
-     */
-    private TemplateCodeType codeType;
-    public TemplateCodeType getCodeType() {
-        return codeType;
-    }
-    public void setCodeType(TemplateCodeType codeType) {
-        this.codeType = codeType;
-    }
-    
-    /**
-     * 品牌名称
-     */
-    private String brandName;
-    public String getBrandName() {
-        return brandName;
-    }
-    public void setBrandName(String brandName) {
-        this.brandName = brandName;
-    }
-    
-    /**
-     * 连锁店id
-     */
-    private String chainId;
-    public String getChainId() {
-        return chainId;
-    }
-    public void setChainId(String chainId) {
-        this.chainId = chainId;
-    }
-    
-    /**
-     * logo
-     */
-    private String logoHash;
-    public String getLogoHash() {
-        return logoHash;
-    }
-    public void setLogoHash(String logoHash) {
-        this.logoHash = logoHash;
-    }
-    
-    /**
-     * 背景图hash
-     */
-    private String backgroundHash;
-    public String getBackgroundHash() {
-        return backgroundHash;
-    }
-    public void setBackgroundHash(String backgroundHash) {
-        this.backgroundHash = backgroundHash;
-    }
-    
-    /**
-     * 背景颜色
-     */
-    private String backgroundColor;
-    public String getBackgroundColor() {
-        return backgroundColor;
-    }
-    public void setBackgroundColor(String backgroundColor) {
-        this.backgroundColor = backgroundColor;
-    }
-    
-    /**
-     * 领卡推荐语
-     */
-    private String greeting;
-    public String getGreeting() {
-        return greeting;
-    }
-    public void setGreeting(String greeting) {
-        this.greeting = greeting;
-    }
-    
-    /**
-     * 开卡表单信息
-     */
-    private FormInfo formInfo;
-    public FormInfo getFormInfo() {
-        return formInfo;
-    }
-    public void setFormInfo(FormInfo formInfo) {
-        this.formInfo = formInfo;
-    }
-    
-    /**
-     * 账户信息
-     */
-    private List<AccountInfo> accountInfos;
-    public List<AccountInfo> getAccountInfos() {
-        return accountInfos;
-    }
-    public void setAccountInfos(List<AccountInfo> accountInfos) {
-        this.accountInfos = accountInfos;
-    }
-    
-    /**
-     * 栏位信息
-     */
-    private List<ColumnInfo> columnInfos;
-    public List<ColumnInfo> getColumnInfos() {
-        return columnInfos;
-    }
-    public void setColumnInfos(List<ColumnInfo> columnInfos) {
-        this.columnInfos = columnInfos;
-    }
-    
-    /**
-     * 会员权益
-     */
-    private List<BenefitInfo> benefitInfos;
-    public List<BenefitInfo> getBenefitInfos() {
-        return benefitInfos;
-    }
-    public void setBenefitInfos(List<BenefitInfo> benefitInfos) {
-        this.benefitInfos = benefitInfos;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/UploadResult.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class UploadResult{
-
-    /**
-     * 图片hash
-     */
-    private String imageHash;
-    public String getImageHash() {
-        return imageHash;
-    }
-    public void setImageHash(String imageHash) {
-        this.imageHash = imageHash;
-    }
-    
-    /**
-     * 图片url
-     */
-    private String imageUrl;
-    public String getImageUrl() {
-        return imageUrl;
-    }
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/card/UserCouponInfo.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.card;
-
-import com.ydd.third.waimai.eleme.api.enumeration.card.*;
-import com.ydd.third.waimai.eleme.api.entity.card.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class UserCouponInfo{
-
-    /**
-     * 场景
-     */
-    private SceneType sceneType;
-    public SceneType getSceneType() {
-        return sceneType;
-    }
-    public void setSceneType(SceneType sceneType) {
-        this.sceneType = sceneType;
-    }
-    
-    /**
-     * 记录id
-     */
-    private long recordId;
-    public long getRecordId() {
-        return recordId;
-    }
-    public void setRecordId(long recordId) {
-        this.recordId = recordId;
-    }
-    
-    /**
-     * 活动id
-     */
-    private long activityId;
-    public long getActivityId() {
-        return activityId;
-    }
-    public void setActivityId(long activityId) {
-        this.activityId = activityId;
-    }
-    
-    /**
-     * 饿了么用户id
-     */
-    private long elemeUserId;
-    public long getElemeUserId() {
-        return elemeUserId;
-    }
-    public void setElemeUserId(long elemeUserId) {
-        this.elemeUserId = elemeUserId;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/content/Credentials.java

@@ -1,56 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.content;
-
-import com.ydd.third.waimai.eleme.api.enumeration.content.*;
-import com.ydd.third.waimai.eleme.api.entity.content.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class Credentials{
-
-    /**
-     * efs配置access_key
-     */
-    private String accessKeyId;
-    public String getAccessKeyId() {
-        return accessKeyId;
-    }
-    public void setAccessKeyId(String accessKeyId) {
-        this.accessKeyId = accessKeyId;
-    }
-    
-    /**
-     * efs配置access_secret
-     */
-    private String secretAccessKey;
-    public String getSecretAccessKey() {
-        return secretAccessKey;
-    }
-    public void setSecretAccessKey(String secretAccessKey) {
-        this.secretAccessKey = secretAccessKey;
-    }
-    
-    /**
-     * efs配置Token，用于efs临时授权访问
-     */
-    private String sessionToken;
-    public String getSessionToken() {
-        return sessionToken;
-    }
-    public void setSessionToken(String sessionToken) {
-        this.sessionToken = sessionToken;
-    }
-    
-    /**
-     * 有效期
-     */
-    @JsonFormat(locale = "zh" , timezone="GMT+8")
-    private Date expiration;
-    public Date getExpiration() {
-        return expiration;
-    }
-    public void setExpiration(Date expiration) {
-        this.expiration = expiration;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/content/OBindInfo.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.content;
-
-import com.ydd.third.waimai.eleme.api.enumeration.content.*;
-import com.ydd.third.waimai.eleme.api.entity.content.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OBindInfo{
-
-    /**
-     * 关联的业务Id
-     */
-    private long bizId;
-    public long getBizId() {
-        return bizId;
-    }
-    public void setBizId(long bizId) {
-        this.bizId = bizId;
-    }
-    
-    /**
-     * 关联的业务类型
-     */
-    private String oBindBizEnum;
-    public String getOBindBizEnum() {
-        return oBindBizEnum;
-    }
-    public void setOBindBizEnum(String oBindBizEnum) {
-        this.oBindBizEnum = oBindBizEnum;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/content/OCreateContentReq.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.content;
-
-import com.ydd.third.waimai.eleme.api.enumeration.content.*;
-import com.ydd.third.waimai.eleme.api.entity.content.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OCreateContentReq{
-
-    /**
-     * 场景码
-     */
-    private ContentSceneEnum scene;
-    public ContentSceneEnum getScene() {
-        return scene;
-    }
-    public void setScene(ContentSceneEnum scene) {
-        this.scene = scene;
-    }
-    
-    /**
-     * 标题
-     */
-    private String title;
-    public String getTitle() {
-        return title;
-    }
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    
-    /**
-     * 视频文件ID
-     */
-    private String fileId;
-    public String getFileId() {
-        return fileId;
-    }
-    public void setFileId(String fileId) {
-        this.fileId = fileId;
-    }
-    
-    /**
-     * 动图起始时间
-     */
-    private Double videoCoverStartTime;
-    public Double getVideoCoverStartTime() {
-        return videoCoverStartTime;
-    }
-    public void setVideoCoverStartTime(Double videoCoverStartTime) {
-        this.videoCoverStartTime = videoCoverStartTime;
-    }
-    
-    /**
-     * 动态封面图
-     */
-    private String coverImage;
-    public String getCoverImage() {
-        return coverImage;
-    }
-    public void setCoverImage(String coverImage) {
-        this.coverImage = coverImage;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/content/OEfsConfig.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.content;
-
-import com.ydd.third.waimai.eleme.api.enumeration.content.*;
-import com.ydd.third.waimai.eleme.api.entity.content.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OEfsConfig{
-
-    /**
-     * efs地址
-     */
-    private String efsAddress;
-    public String getEfsAddress() {
-        return efsAddress;
-    }
-    public void setEfsAddress(String efsAddress) {
-        this.efsAddress = efsAddress;
-    }
-    
-    /**
-     * bucket名字
-     */
-    private String bucketName;
-    public String getBucketName() {
-        return bucketName;
-    }
-    public void setBucketName(String bucketName) {
-        this.bucketName = bucketName;
-    }
-    
-    /**
-     * 认证信息
-     */
-    private Credentials credentials;
-    public Credentials getCredentials() {
-        return credentials;
-    }
-    public void setCredentials(Credentials credentials) {
-        this.credentials = credentials;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/content/OVideo.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.content;
-
-import com.ydd.third.waimai.eleme.api.enumeration.content.*;
-import com.ydd.third.waimai.eleme.api.entity.content.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OVideo{
-
-    /**
-     * 视频Id
-     */
-    private long videoId;
-    public long getVideoId() {
-        return videoId;
-    }
-    public void setVideoId(long videoId) {
-        this.videoId = videoId;
-    }
-    
-    /**
-     * 视频Url
-     */
-    private String videoUrl;
-    public String getVideoUrl() {
-        return videoUrl;
-    }
-    public void setVideoUrl(String videoUrl) {
-        this.videoUrl = videoUrl;
-    }
-    
-    /**
-     * 视频上传人Id（店铺Id）
-     */
-    private long sourceId;
-    public long getSourceId() {
-        return sourceId;
-    }
-    public void setSourceId(long sourceId) {
-        this.sourceId = sourceId;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/content/OVideoBindInfo.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.content;
-
-import com.ydd.third.waimai.eleme.api.enumeration.content.*;
-import com.ydd.third.waimai.eleme.api.entity.content.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OVideoBindInfo{
-
-    /**
-     * 视频关联业务信息列表
-     */
-    private List<OBindInfo> oBindInfo;
-    public List<OBindInfo> getOBindInfo() {
-        return oBindInfo;
-    }
-    public void setOBindInfo(List<OBindInfo> oBindInfo) {
-        this.oBindInfo = oBindInfo;
-    }
-    
-    /**
-     * 视频Id
-     */
-    private long videoId;
-    public long getVideoId() {
-        return videoId;
-    }
-    public void setVideoId(long videoId) {
-        this.videoId = videoId;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/content/OVideoInfo.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.content;
-
-import com.ydd.third.waimai.eleme.api.enumeration.content.*;
-import com.ydd.third.waimai.eleme.api.entity.content.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OVideoInfo{
-
-    /**
-     * efs所用key，由shopId和efs认证信息中的有效期生成
-     */
-    private String videoKey;
-    public String getVideoKey() {
-        return videoKey;
-    }
-    public void setVideoKey(String videoKey) {
-        this.videoKey = videoKey;
-    }
-    
-    /**
-     * 视频versionId，视频上传后由efs返回
-     */
-    private String versionId;
-    public String getVersionId() {
-        return versionId;
-    }
-    public void setVersionId(String versionId) {
-        this.versionId = versionId;
-    }
-    
-    /**
-     * 视频大小byte
-     */
-    private Long sizeInByte;
-    public Long getSizeInByte() {
-        return sizeInByte;
-    }
-    public void setSizeInByte(Long sizeInByte) {
-        this.sizeInByte = sizeInByte;
-    }
-    
-    /**
-     * 视频标题
-     */
-    private String title;
-    public String getTitle() {
-        return title;
-    }
-    public void setTitle(String title) {
-        this.title = title;
-    }
-    
-    /**
-     * 视频描述
-     */
-    private String description;
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/cpc/OAllBalance.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.cpc;
-
-import com.ydd.third.waimai.eleme.api.enumeration.cpc.*;
-import com.ydd.third.waimai.eleme.api.entity.cpc.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OAllBalance{
-
-    /**
-     * 推广资金总额(整数、单位：分)
-     */
-    private int totalBalance;
-    public int getTotalBalance() {
-        return totalBalance;
-    }
-    public void setTotalBalance(int totalBalance) {
-        this.totalBalance = totalBalance;
-    }
-    
-    /**
-     * 普通账户(整数、单位：分)
-     */
-    private int balance;
-    public int getBalance() {
-        return balance;
-    }
-    public void setBalance(int balance) {
-        this.balance = balance;
-    }
-    
-    /**
-     * 竞价活动账户(整数、单位：分)
-     */
-    private int wagerBalance;
-    public int getWagerBalance() {
-        return wagerBalance;
-    }
-    public void setWagerBalance(int wagerBalance) {
-        this.wagerBalance = wagerBalance;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/cpc/ORankAndCost.java

@@ -1,66 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.cpc;
-
-import com.ydd.third.waimai.eleme.api.enumeration.cpc.*;
-import com.ydd.third.waimai.eleme.api.entity.cpc.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ORankAndCost{
-
-    /**
-     * 位置
-     */
-    private int rank;
-    public int getRank() {
-        return rank;
-    }
-    public void setRank(int rank) {
-        this.rank = rank;
-    }
-    
-    /**
-     * 点击提升数
-     */
-    private int clickCount;
-    public int getClickCount() {
-        return clickCount;
-    }
-    public void setClickCount(int clickCount) {
-        this.clickCount = clickCount;
-    }
-    
-    /**
-     * 点击成本（元）
-     */
-    private double averageCost;
-    public double getAverageCost() {
-        return averageCost;
-    }
-    public void setAverageCost(double averageCost) {
-        this.averageCost = averageCost;
-    }
-    
-    /**
-     * 推广费用（元）
-     */
-    private double totalCost;
-    public double getTotalCost() {
-        return totalCost;
-    }
-    public void setTotalCost(double totalCost) {
-        this.totalCost = totalCost;
-    }
-    
-    /**
-     * 推广费用占比
-     */
-    private double costRateInPage;
-    public double getCostRateInPage() {
-        return costRateInPage;
-    }
-    public void setCostRateInPage(double costRateInPage) {
-        this.costRateInPage = costRateInPage;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/cpc/ORankAndCostInfo.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.cpc;
-
-import com.ydd.third.waimai.eleme.api.enumeration.cpc.*;
-import com.ydd.third.waimai.eleme.api.entity.cpc.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ORankAndCostInfo{
-
-    /**
-     * 列表数据
-     */
-    private List<ORankAndCost> dataList;
-    public List<ORankAndCost> getDataList() {
-        return dataList;
-    }
-    public void setDataList(List<ORankAndCost> dataList) {
-        this.dataList = dataList;
-    }
-    
-    /**
-     * 总计点击次数
-     */
-    private int totalClickCount;
-    public int getTotalClickCount() {
-        return totalClickCount;
-    }
-    public void setTotalClickCount(int totalClickCount) {
-        this.totalClickCount = totalClickCount;
-    }
-    
-    /**
-     * 总计推广费用（元）
-     */
-    private double totalCost;
-    public double getTotalCost() {
-        return totalCost;
-    }
-    public void setTotalCost(double totalCost) {
-        this.totalCost = totalCost;
-    }
-    
-    /**
-     * 平均单次点击费用（元）
-     */
-    private double averageCost;
-    public double getAverageCost() {
-        return averageCost;
-    }
-    public void setAverageCost(double averageCost) {
-        this.averageCost = averageCost;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/cpc/ORankAndCostSummary.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.cpc;
-
-import com.ydd.third.waimai.eleme.api.enumeration.cpc.*;
-import com.ydd.third.waimai.eleme.api.entity.cpc.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ORankAndCostSummary{
-
-    /**
-     * 首页
-     */
-    private ORankAndCostInfo homeInfo;
-    public ORankAndCostInfo getHomeInfo() {
-        return homeInfo;
-    }
-    public void setHomeInfo(ORankAndCostInfo homeInfo) {
-        this.homeInfo = homeInfo;
-    }
-    
-    /**
-     * 分类页
-     */
-    private ORankAndCostInfo categoryInfo;
-    public ORankAndCostInfo getCategoryInfo() {
-        return categoryInfo;
-    }
-    public void setCategoryInfo(ORankAndCostInfo categoryInfo) {
-        this.categoryInfo = categoryInfo;
-    }
-    
-    /**
-     * 搜索页
-     */
-    private ORankAndCostInfo searchInfo;
-    public ORankAndCostInfo getSearchInfo() {
-        return searchInfo;
-    }
-    public void setSearchInfo(ORankAndCostInfo searchInfo) {
-        this.searchInfo = searchInfo;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/cpc/ORankEffect.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.cpc;
-
-import com.ydd.third.waimai.eleme.api.enumeration.cpc.*;
-import com.ydd.third.waimai.eleme.api.entity.cpc.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class ORankEffect{
-
-    /**
-     * 分类页
-     */
-    private RankEffectCategory channel;
-    public RankEffectCategory getChannel() {
-        return channel;
-    }
-    public void setChannel(RankEffectCategory channel) {
-        this.channel = channel;
-    }
-    
-    /**
-     * 首页
-     */
-    private RankEffectCategory home;
-    public RankEffectCategory getHome() {
-        return home;
-    }
-    public void setHome(RankEffectCategory home) {
-        this.home = home;
-    }
-    
-    /**
-     * 搜索
-     */
-    private RankEffectCategory search;
-    public RankEffectCategory getSearch() {
-        return search;
-    }
-    public void setSearch(RankEffectCategory search) {
-        this.search = search;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/cpc/OShopCertificationResponse.java

@@ -1,33 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.cpc;
-
-import com.ydd.third.waimai.eleme.api.enumeration.cpc.*;
-import com.ydd.third.waimai.eleme.api.entity.cpc.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OShopCertificationResponse{
-
-    /**
-     * 查询结果:true：证书齐全；false：证书不齐全，缺失证书请查阅checkResult
-     */
-    private boolean checkCode;
-    public boolean getCheckCode() {
-        return checkCode;
-    }
-    public void setCheckCode(boolean checkCode) {
-        this.checkCode = checkCode;
-    }
-    
-    /**
-     * 响应结果信息:checkCode=false，可以查阅此信息
-     */
-    private String checkResult;
-    public String getCheckResult() {
-        return checkResult;
-    }
-    public void setCheckResult(String checkResult) {
-        this.checkResult = checkResult;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/cpc/OShopWagerEstimate.java

@@ -1,44 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.cpc;
-
-import com.ydd.third.waimai.eleme.api.enumeration.cpc.*;
-import com.ydd.third.waimai.eleme.api.entity.cpc.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OShopWagerEstimate{
-
-    /**
-     * 商户id
-     */
-    private long restaurantId;
-    public long getRestaurantId() {
-        return restaurantId;
-    }
-    public void setRestaurantId(long restaurantId) {
-        this.restaurantId = restaurantId;
-    }
-    
-    /**
-     * 预估每日点击量
-     */
-    private int estimateClick;
-    public int getEstimateClick() {
-        return estimateClick;
-    }
-    public void setEstimateClick(int estimateClick) {
-        this.estimateClick = estimateClick;
-    }
-    
-    /**
-     * 预估每日预算(元)
-     */
-    private double estimateBudget;
-    public double getEstimateBudget() {
-        return estimateBudget;
-    }
-    public void setEstimateBudget(double estimateBudget) {
-        this.estimateBudget = estimateBudget;
-    }
-    
-}

lb-third/lb-third-waimai/src/main/java/com/ydd/third/waimai/eleme/api/entity/cpc/OSuggestWagerInfo.java

@@ -1,55 +0,0 @@
-package com.ydd.third.waimai.eleme.api.entity.cpc;
-
-import com.ydd.third.waimai.eleme.api.enumeration.cpc.*;
-import com.ydd.third.waimai.eleme.api.entity.cpc.*;
-import java.util.*;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-public class OSuggestWagerInfo{
-
-    /**
-     * 店铺号
-     */
-    private long restaurantId;
-    public long getRestaurantId() {
-        return restaurantId;
-    }
-    public void setRestaurantId(long restaurantId) {
-        this.restaurantId = restaurantId;
-    }
-    
-    /**
-     * 推荐出价(元)
-     */
-    private double recommendBid;
-    public double getRecommendBid() {
-        return recommendBid;
-    }
-    public void setRecommendBid(double recommendBid) {
-        this.recommendBid = recommendBid;
-    }
-    
-    /**
-     * 预估每日点击量
-     */
-    private int estimateClick;
-    public int getEstimateClick() {
-        return estimateClick;
-    }
-    public void setEstimateClick(int estimateClick) {
-        this.estimateClick = estimateClick;
-    }
-    
-    /**
-     * 预估每日预算(元)
-     */
-    private double estimateBudget;
-    public double getEstimateBudget() {
-        return estimateBudget;
-    }
-    public void setEstimateBudget(double estimateBudget) {
-        this.estimateBudget = estimateBudget;
-    }
-    
-}