1.后台代码删简

2.商家入驻修改
3.网点管理修改

mall-miniapp-service/src/main/resources/bootstrap.properties

@@ -20,11 +20,6 @@ spring.devtools.add-properties=true
 spring.cache.type=ehcache
 spring.cache.ehcache.config=classpath:ehcache.xml
 
-#�人С����appid
-# wx911583ecddef2439
-#�人С������Կ
-# 7dfb5308abc337986fabce671b7f3fe1
-
 ### log4j����
 logging.config=classpath:logback.xml
 #undertow_web��������

mall-server-api/pom.xml

@@ -19,10 +19,6 @@
     </properties>
 
     <dependencies>
-        <!--<dependency>-->
-        <!--<groupId>org.springframework.boot</groupId>-->
-        <!--<artifactId>spring-boot-starter-security</artifactId>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -54,12 +50,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!--<dependency>-->
-        <!--<groupId>org.mongodb</groupId>-->
-        <!--<artifactId>mongo-java-driver</artifactId>-->
-        <!--<version>3.2.2</version>-->
-        <!--</dependency>-->
-
         <!--mybatis-->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
@@ -76,18 +66,7 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.4.2</version>
-            <!--<exclusions>-->
-                <!--<exclusion>-->
-                    <!--<artifactId>mybatis</artifactId>-->
-                    <!--<groupId>org.mybatis</groupId>-->
-                <!--</exclusion>-->
-            <!--</exclusions>-->
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>com.baomidou</groupId>-->
-            <!--<artifactId>mybatis-plus-generator</artifactId>-->
-            <!--<version>3.2.0</version>-->
-        <!--</dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity-engine-core</artifactId>
@@ -99,13 +78,6 @@
             <version>1.18.8</version>
             <scope>provided</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.mybatis.spring.boot</groupId>-->
-            <!--<artifactId>mybatis-spring-boot-autoconfigure</artifactId>-->
-            <!--<version>2.1.0</version>-->
-        <!--</dependency>-->
-
-
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
@@ -348,37 +320,6 @@
             <artifactId>logstash-logback-encoder</artifactId>
             <version>6.3</version>
         </dependency>
-
-        <dependency>
-            <groupId>com.github.wxpay</groupId>
-            <artifactId>wxpay-sdk</artifactId>
-            <version>0.0.3</version>
-        </dependency>
-
-        <!--企业微信api-->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-cp</artifactId>
-            <version>4.5.0</version>
-        </dependency>
-        <!-- 微信支付 -->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-pay</artifactId>
-            <version>4.5.0</version>
-        </dependency>
-        <!-- 微信小程序 -->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-miniapp</artifactId>
-            <version>4.5.0</version>
-        </dependency>
-        <!--公众号-->
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-mp</artifactId>
-            <version>4.5.0</version>
-        </dependency>
         <!-- hutool工具 -->
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -391,24 +332,21 @@
             <artifactId>forest-spring-boot-starter</artifactId>
             <version>1.5.19</version>
         </dependency>
-
-        <!--企业微信会话存档-->
-        <!--<dependency>-->
-            <!--<groupId>org.bouncycastle</groupId>-->
-            <!--<artifactId>bcpg-jdk16</artifactId>-->
-            <!--<version>1.46</version>-->
-        <!--</dependency>-->
-        <!--<dependency>-->
-            <!--<groupId>org.bouncycastle</groupId>-->
-            <!--<artifactId>bcpkix-jdk15on</artifactId>-->
-            <!--<version>1.64</version>-->
-        <!--</dependency>-->
-
         <!-- 校验 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

mall-server-api/src/main/java/com/gree/mall/manager/ManagerApplication.java

@@ -6,7 +6,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -15,8 +14,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @ServletComponentScan(basePackages = {"com.gree.mall.manager"})
 @EnableAsync
 @EnableScheduling
-//@EnableFeignClients
-@EnableDiscoveryClient
 @EnableCaching
 @MapperScan(basePackages = {
         "com.gree.mall.manager.plus.mapper",

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/CustomSecSpecBean.java

@@ -1,50 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.SecKillStage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@ApiModel
-@Data
-public class CustomSecSpecBean {
-
-    @ApiModelProperty("秒杀商品规格id")
-    private String secKillSpecId;
-
-    @ApiModelProperty("商品名称")
-    private String goodsName;
-
-    @ApiModelProperty("秒杀图片链接")
-    private String imgUrl;
-
-    @ApiModelProperty("划线价")
-    private String orgPrice;
-
-    @ApiModelProperty("已售数量")
-    private Long soldNum;
-
-    @ApiModelProperty("秒杀价格")
-    private BigDecimal price;
-
-    @ApiModelProperty("分账金额")
-    private BigDecimal amount;
-
-    @ApiModelProperty("秒杀开始时间")
-    private Date startTime;
-
-    @ApiModelProperty("秒杀结束时间")
-    private Date endTime;
-
-    @ApiModelProperty(value = "分销比例")
-    private Double sharePercent;
-
-    @ApiModelProperty("秒杀状态,0全部,1未开始,2进行中,3已结束,4已关闭")
-    private Integer status;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/CustomSpecBean.java

@@ -1,50 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-@ApiModel
-@Data
-public class CustomSpecBean {
-
-    @ApiModelProperty("商品id")
-    private String goodsId;
-
-    @ApiModelProperty("商品规格Id")
-    private String goodsSpecId;
-
-    @ApiModelProperty("商品名称")
-    private String goodsName;
-
-    @ApiModelProperty("商品图片")
-    private String imgUrl;
-
-    @ApiModelProperty("商品价格")
-    private String goodsPrice;
-
-    @ApiModelProperty("商品库存")
-    private String stockNum;
-
-    @ApiModelProperty("商品规格名")
-    private String name;
-
-    @ApiModelProperty("商品规格值")
-    private String specValue;
-
-    @ApiModelProperty(value = "分销比例")
-    private Double sharePercent;
-
-    @ApiModelProperty("分账金额")
-    private BigDecimal amount;
-
-    @ApiModelProperty("划线价")
-    private String orgPrice;
-
-    @ApiModelProperty("已售数量")
-    private Long salesVolume;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionActivityBatchBean.java

@@ -1,22 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.enums.promotion.PromotionStatusEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class PromotionActivityBatchBean {
-
-    @ApiModelProperty(value = "活动单id")
-    private List<String> ids;
-
-    @ApiModelProperty(value = "最新跟进结果")
-    private PromotionStatusEnum status = PromotionStatusEnum.ING;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionActivityBean.java

@@ -1,24 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.PromotionActivity;
-import com.gree.mall.manager.plus.entity.PromotionActivityItem;
-import com.gree.mall.manager.plus.entity.PromotionActivityRecord;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class PromotionActivityBean extends PromotionActivity {
-
-    @ApiModelProperty(value = "报名信息")
-    private List<PromotionActivityItem> items;
-
-    @ApiModelProperty(value = "跟进记录")
-    private List<PromotionActivityRecord> records;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionActivityVO.java

@@ -1,87 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.promotion.PromotionStatusEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class PromotionActivityVO {
-
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "所属商户")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "所属网点")
-    private String customWebsitName;
-
-    @ApiModelProperty(value = "活动提交单号")
-    private String promotionActivityId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "设置活动id")
-    private String promotionQuestionnaireId;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "活动名称")
-    private String name;
-
-    @ApiModelProperty(value = "状态")
-    private PromotionStatusEnum status;
-
-    @ZfireField(type = "date", tbName = "b")
-    @ApiModelProperty(value = "活动开始日期")
-    private Date startTime;
-
-    @ZfireField(type = "date", tbName = "b")
-    @ApiModelProperty(value = "活动结束日期")
-    private Date endTime;
-
-    @ApiModelProperty(value = "客户名称")
-    private String userName;
-
-    @ApiModelProperty(value = "联系人")
-    private String linkName;
-
-    @ApiModelProperty(value = "客户电话")
-    private String userMobile;
-
-    @ApiModelProperty(value = "客户电话2")
-    private String userMobile2;
-
-    @ApiModelProperty(value = "客户地址")
-    private String userAddress;
-
-    @ApiModelProperty(value = "提交人")
-    private String createBy;
-
-    @ApiModelProperty(value = "提交时间")
-    private Date createTime;
-
-    @ZfireField(tbName = "b", hide = true, colName = "create_by", ignoreSelect = true)
-    @ApiModelProperty(value = "创建人")
-    private String orderCreateBy;
-
-    @ZfireField(tbName = "b", hide = true, colName = "create_mobile", ignoreSelect = true)
-    @ApiModelProperty(value = "创建人电话")
-    private String orderCreateMobile;
-
-    @ZfireField(tbName = "b", hide = true, colName = "create_time", ignoreSelect = true)
-    @ApiModelProperty(value = "创建时间")
-    private Date orderCreateTime;
-
-    @ApiModelProperty(value = "最新跟进人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "最新跟进时间")
-    private Date updateTime;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionApplyBean.java

@@ -1,15 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.PromotionApply;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel
-@Data
-public class PromotionApplyBean extends PromotionApply {
-
-    @ApiModelProperty("网点名称")
-    private String adminWebsitName;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGoods.java

@@ -1,25 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.PromotionGroupSpec;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class PromotionGoods {
-
-    @ApiModelProperty("商品id")
-    private String goodsId;
-    @ApiModelProperty("商品名称")
-    private String goodsName;
-    @ApiModelProperty("商品图")
-    private String goodsImgSrc;
-    @ApiModelProperty("活动规格列表")
-    private List<PromotionGroupSpec> specs;
-    @ApiModelProperty("排序")
-    private Integer sortNum;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupBean.java

@@ -1,22 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.PromotionGroup;
-import com.gree.mall.manager.plus.entity.PromotionGroupSpec;
-import com.gree.mall.manager.plus.entity.PromotionGroupUser;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class PromotionGroupBean extends PromotionGroup {
-
-    @ApiModelProperty("商品详情")
-    private List<PromotionGoods> goods;
-
-    @ApiModelProperty("团员id")
-    private List<PromotionGroupUser> promotionGroupUsers;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupDetail.java

@@ -1,38 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel
-@Data
-public class PromotionGroupDetail {
-
-    @ApiModelProperty("用户id")
-    private String userId;
-    @ApiModelProperty("团长名称")
-    private String nickName;
-    @ApiModelProperty("所属网点")
-    private String websitName;
-    @ApiModelProperty("职务")
-    private String position;
-    @ApiModelProperty("手机号码")
-    private String phone;
-    @ApiModelProperty("首次分享时间")
-    private Date firstTime;
-    @ApiModelProperty("分享次数")
-    private Integer shareNum;
-    @ApiModelProperty("订单数量")
-    private Integer orderNum;
-    @ApiModelProperty("订单台数")
-    private Integer goodsNum;
-    @ApiModelProperty("成交金额")
-    private BigDecimal orderTotalAmount;
-    @ApiModelProperty("团长分佣总额")
-    private BigDecimal shareTotalAmount;
-    @ApiModelProperty("团长已分佣金额")
-    private BigDecimal settledAmount;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupList.java

@@ -1,26 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.PromotionGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@ApiModel
-@Data
-public class PromotionGroupList extends PromotionGroup {
-
-    @ApiModelProperty("参数产品数量")
-    private Integer goodsNum;
-    @ApiModelProperty("订单数量")
-    private Integer orderNum;
-    @ApiModelProperty("订单台数")
-    private Integer orderDetailNum;
-    @ApiModelProperty("订单总金额")
-    private BigDecimal orderTotalAmount;
-    @ApiModelProperty("团长分佣总额")
-    private BigDecimal shareTotalAmount;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionGroupSpecBean.java

@@ -1,17 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.PromotionGroupSpec;
-import com.gree.mall.manager.plus.entity.PromotionGroupSpecUser;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class PromotionGroupSpecBean extends PromotionGroupSpec {
-
-    @ApiModelProperty("团长集合")
-    private List<PromotionGroupSpecUser> promotionGroupSpecUsers;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/PromotionQuestionnaireAddBean.java

@@ -1,32 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.PromotionQuestionnaire;
-import com.gree.mall.manager.plus.entity.PromotionQuestionnaireItem;
-import com.gree.mall.manager.plus.entity.PromotionQuestionnaireQrcode;
-import com.gree.mall.manager.plus.entity.PromotionQuestionnaireUser;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 问卷活动新增
- * @author ：lijh
- * @description：TODO
- * @date ：2024/5/7 10:33
- */
-@ApiModel
-@Data
-public class PromotionQuestionnaireAddBean extends PromotionQuestionnaire {
-
-    @ApiModelProperty("提交记录")
-    private List<PromotionQuestionnaireUser> promotionQuestionnaireUsers;
-    @ApiModelProperty("活动题目")
-    private List<PromotionQuestionnaireItem> promotionQuestionnaireItems;
-    @ApiModelProperty("各网点二维码")
-    private List<PromotionQuestionnaireQrcode> promotionQuestionnaireQrcodes;
-    @ApiModelProperty("状态0=未开始 1=进行中 2=已过期 3=已终止")
-    private Integer status;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/SecKillActivityBean.java

@@ -1,22 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.CommonFile;
-import com.gree.mall.manager.plus.entity.SecKillActivity;
-import com.gree.mall.manager.plus.entity.SecKillActivitySpec;
-import com.gree.mall.manager.plus.entity.SecKillStage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class SecKillActivityBean extends SecKillActivity {
-
-    @ApiModelProperty("秒杀商品规格列表")
-    private List<SecKillActivitySpecBean> goodsSpecs;
-    @ApiModelProperty("秒杀场次列表")
-    private List<SecKillStage> stages;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/SecKillActivitySpecBean.java

@@ -1,17 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.SecKillActivity;
-import com.gree.mall.manager.plus.entity.SecKillActivitySpec;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class SecKillActivitySpecBean extends SecKillActivitySpec {
-    @ApiModelProperty("商品总库存")
-    private Integer stockNum;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/SecKillActivityStageBean.java

@@ -1,21 +0,0 @@
-package com.gree.mall.manager.bean.activity;
-
-import com.gree.mall.manager.plus.entity.SecKillActivity;
-import com.gree.mall.manager.plus.entity.SecKillStage;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-@ApiModel
-@Data
-public class SecKillActivityStageBean extends SecKillActivity {
-
-    @ApiModelProperty("秒杀场次列表")
-    private List<SecKillStage> stages;
-    @ApiModelProperty("状态1未开始,2进行中,3已结束")
-    private Integer activityStatus;
-    @ApiModelProperty("秒杀商品数量")
-    private Integer specCount;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/fullpiece/PromotionFullPieceBean.java

@@ -1,22 +0,0 @@
-package com.gree.mall.manager.bean.activity.fullpiece;
-
-import com.gree.mall.manager.plus.entity.PromotionFullPiece;
-import com.gree.mall.manager.plus.entity.PromotionFullPieceItem;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class PromotionFullPieceBean extends PromotionFullPiece {
-
-    @ApiModelProperty("活动门揽")
-    private List<PromotionFullPieceItem> items;
-
-    @ApiModelProperty("参与商品")
-    private List<String> goodsIds;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/fullpiece/PromotionFullPieceListVO.java

@@ -1,39 +0,0 @@
-package com.gree.mall.manager.bean.activity.fullpiece;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel
-@Data
-public class PromotionFullPieceListVO {
-
-    private String id;
-    @ApiModelProperty("活动名称")
-    private String name;
-    @ApiModelProperty("参与产品数量")
-    private Integer goodsNum;
-    @ApiModelProperty("活动开始时间")
-    private Date startTime;
-    @ApiModelProperty("活动结束时间")
-    private Date endTime;
-    @ApiModelProperty("状态")
-    private String status;
-    @ApiModelProperty("订单数量")
-    private Integer orderNums;
-    @ApiModelProperty("订单总金额")
-    private BigDecimal orderTotalAmount;
-    @ApiModelProperty("创建人")
-    private String createBy;
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-    @ApiModelProperty("更新人")
-    private String updateBy;
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/fullpiece/PromotionFullPieceOrderVO.java

@@ -1,28 +0,0 @@
-package com.gree.mall.manager.bean.activity.fullpiece;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel
-@Data
-public class PromotionFullPieceOrderVO {
-
-    @ApiModelProperty("订单号")
-    private String orderId;
-    @ApiModelProperty("商品名称")
-    private String goodsName;
-    @ApiModelProperty("件数")
-    private Integer num;
-    @ApiModelProperty("订单金额")
-    private BigDecimal payAmount;
-    @ApiModelProperty("佣金比例(例如：0.1)")
-    private BigDecimal shareRate;
-    @ApiModelProperty("订单状态 NOPAY:待付款 DFH:待发货 YFH:已发货 OVER:已完成 CLOSE:已关闭 TIMEOUT:超时取消 REFUND:售后")
-    private String orderStatus;
-    @ApiModelProperty("下单时间")
-    private Date createTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/fullpiece/PromotionFullPieceVO.java

@@ -1,23 +0,0 @@
-package com.gree.mall.manager.bean.activity.fullpiece;
-
-import com.gree.mall.manager.plus.entity.Goods;
-import com.gree.mall.manager.plus.entity.PromotionFullPiece;
-import com.gree.mall.manager.plus.entity.PromotionFullPieceItem;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class PromotionFullPieceVO extends PromotionFullPiece {
-
-    @ApiModelProperty("活动门揽")
-    private List<PromotionFullPieceItem> itemList;
-
-    @ApiModelProperty("参与的商品")
-    private List<Goods> goodsList;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawBean.java

@@ -1,21 +0,0 @@
-package com.gree.mall.manager.bean.activity.luckdraw;
-
-import com.gree.mall.manager.plus.entity.PromotionLuckDraw;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@ApiModel
-@Data
-public class PromotionLuckDrawBean extends PromotionLuckDraw {
-
-    @NotNull
-    @ApiModelProperty("优惠券")
-    private List<PromotionLuckDrawCouponBean> promotionLuckDrawCoupons;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawCodeBean.java

@@ -1,41 +0,0 @@
-package com.gree.mall.manager.bean.activity.luckdraw;
-
-import com.gree.mall.manager.plus.entity.PromotionLuckDraw;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel
-@Data
-public class PromotionLuckDrawCodeBean extends PromotionLuckDraw {
-
-    @ApiModelProperty("券名称")
-    private String couponName;
-    @ApiModelProperty("券类型 SATISFY=满减券 GOODS=商品券 DISCOUNT=折扣券")
-    private String couponType;
-    @ApiModelProperty("券面值")
-    private BigDecimal discountAmount;
-    @ApiModelProperty("兑换码")
-    private String code;
-    @ApiModelProperty("状态 0=未兑换 1=已兑换未使用 2=已使用")
-    private Integer status2;
-    @ApiModelProperty("领取人昵称")
-    private String userNickName;
-    @ApiModelProperty("领取人手机号")
-    private String userMobile;
-    @ApiModelProperty("领取人兑换时间")
-    private Date userExchangeTime;
-    @ApiModelProperty("领取人使用时间")
-    private Date userUseTime;
-    @ApiModelProperty("订单号")
-    private String orderId;
-    @ApiModelProperty("订单用户")
-    private String userName;
-    @ApiModelProperty("订单状态")
-    private String orderStatus;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawCouponBean.java

@@ -1,30 +0,0 @@
-package com.gree.mall.manager.bean.activity.luckdraw;
-
-import com.gree.mall.manager.plus.entity.Goods;
-import com.gree.mall.manager.plus.entity.PromotionLuckDrawCoupon;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class PromotionLuckDrawCouponBean extends PromotionLuckDrawCoupon {
-
-    @ApiModelProperty("商品券对应商品id")
-    private List<String> goodsIds;
-
-    @ApiModelProperty("商品券对应的商品（详情用，新增不用传）")
-    private List<Goods> goodsList;
-
-    @ApiModelProperty("兑换数量（详情用，新增不用传）")
-    private Integer dhsl = 0;
-    @ApiModelProperty("剩余兑换数量（详情用，新增不用传）")
-    private Integer sydhsl = 0;
-    @ApiModelProperty("使用数量（详情用，新增不用传）")
-    private Integer sysl = 0;
-    @ApiModelProperty("未使用数量（详情用，新增不用传）")
-    private Integer wsysl = 0;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/activity/luckdraw/PromotionLuckDrawList.java

@@ -1,34 +0,0 @@
-package com.gree.mall.manager.bean.activity.luckdraw;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@ApiModel
-@Data
-public class PromotionLuckDrawList {
-
-    @ApiModelProperty("id")
-    private String id;
-    @ApiModelProperty("商户")
-    private String companyWechatName;
-    @ApiModelProperty("活动名称")
-    private String name;
-    @ApiModelProperty("优惠券总数")
-    private Integer total;
-    @ApiModelProperty("兑换总数")
-    private Integer exchangeTotal;
-    @ApiModelProperty("剩余兑换数量")
-    private Integer surplusExchange;
-    @ApiModelProperty("使用总数")
-    private Integer useTotal;
-    @ApiModelProperty("未使用数量")
-    private Integer notUse;
-    @ApiModelProperty("状态 true/false")
-    private Boolean status;
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/AdminUserCom.java

@@ -24,14 +24,7 @@ public class AdminUserCom extends AdminUser {
     private Boolean onlyRead = false;
     @ApiModelProperty("商户ids")
     private List<String> companyWechatIds;
-//    @ApiModelProperty("企微id")
-//    private List<String> corpIds;
-//    @ApiModelProperty("企业微信id")
-//    private String corpId;
-//    @ApiModelProperty("当前登录人企业微信id")
-//    private String loginCompanyWechatId;
-//    @ApiModelProperty("当前登录人企业名称")
-//    private String loginCompanyName;
+
     @ApiModelProperty("当前登录人所使用的商户信息")
     private AdminCompanyWechat adminCompanyWechat;
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/admin/AdminWebsitNewBean.java

@@ -1,19 +1,13 @@
 package com.gree.mall.manager.bean.admin;
 
 import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.AdminWebsitPayConfig;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 @EqualsAndHashCode(callSuper = true)
 @ApiModel
 @Data
 public class AdminWebsitNewBean extends AdminWebsit {
 
-    @ApiModelProperty("通联支付配置")
-    private List<AdminWebsitPayConfig> payConfigList;
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/EnginPayManageBean.java

@@ -1,32 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.plus.entity.EnginPayManage;
-import com.gree.mall.manager.plus.entity.EnginPayManageItem;
-import com.gree.mall.manager.plus.entity.EnginPayManageRecord;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class EnginPayManageBean extends EnginPayManage {
-
-    @ApiModelProperty(value = "产品信息")
-    private List<EnginPayManageItem> items;
-
-    @ApiModelProperty(value = "收款信息")
-    private List<EnginPayManageRecord> records;
-//
-//    @ApiModelProperty(value = "收款金额")
-//    private BigDecimal payAmount;
-//
-//    @ApiModelProperty(value = "收款信息")
-//    private String fileUrl;
-//
-//    @ApiModelProperty(value = "收款备注")
-//    private String payRemark;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/EnginPayManageGatherVO.java

@@ -1,54 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.engin.EnginPayManageStatusEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class EnginPayManageGatherVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "工程编号")
-    private String projectNo;
-
-    @ApiModelProperty(value = "工程名称")
-    private String projectName;
-
-    @ZfireField(isQuery = false, ignoreSelect = true)
-    @ApiModelProperty(value = "状态")
-    private EnginPayManageStatusEnum status;
-
-    @ZfireField(isQuery = false, ignoreSelect = true)
-    @ApiModelProperty(value = "销售金额")
-    private BigDecimal totalSalesAmount;
-
-    @ZfireField(isQuery = false, ignoreSelect = true)
-    @ApiModelProperty(value = "收款金额")
-    private BigDecimal totalPayAmount;
-
-    @ZfireField(isQuery = false, ignoreSelect = true)
-    @ApiModelProperty(value = "未收款金额")
-    private BigDecimal totalNotPayAmount;
-
-    @ZfireField(isQuery = false, ignoreSelect = true)
-    @ApiModelProperty(value = "修改人")
-    private String lastUpdateBy;
-
-    @ZfireField(isQuery = false, ignoreSelect = true)
-    @ApiModelProperty(value = "修改时间")
-    private Date lastUpdateTime;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/EnginPayManageImport.java

@@ -1,81 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.bean.common.RegionBean;
-import com.gree.mall.manager.plus.entity.Region;
-import com.gree.mall.manager.plus.entity.WebsitGoodsAlone;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.math.BigDecimal;
-
-@Data
-@Accessors(chain = true)
-public class EnginPayManageImport {
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型名称(多选时/分割)")
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "工程名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "工程编号")
-    private String projectNo;
-
-    @ApiModelProperty(value = "销售单号")
-    private String salesNo;
-
-    @ApiModelProperty(value = "销售网点")
-    private String salesWebsit;
-
-    @ApiModelProperty(value = "费用类型 M=辅材 P=配件")
-    private String goodsType;
-
-    @ApiModelProperty(value = "客户名称")
-    private String customerName;
-
-    @ApiModelProperty(value = "联系人")
-    private String linkName;
-
-    @ApiModelProperty(value = "客户电话")
-    private String customerMobile;
-
-    @ApiModelProperty(value = "客户电话2")
-    private String customerMobile2;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "范围")
-    private Region region;
-
-    @ApiModelProperty(value = "范围名称")
-    private RegionBean regionBean;
-
-    @ApiModelProperty(value = "商品")
-    private WebsitGoodsAlone goodsAlone;
-
-    @ApiModelProperty(value = "价格")
-    private BigDecimal salesPrice;
-
-    @ApiModelProperty(value = "数量")
-    private BigDecimal qty;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/EnginPayManageVO.java

@@ -1,130 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.engin.EnginPayManageStatusEnum;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class EnginPayManageVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "工单类型")
-//    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "工程名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "工程编号")
-    private String projectNo;
-
-    @ApiModelProperty(value = "销售单号")
-    private String salesNo;
-
-    @ApiModelProperty(value = "销售网点")
-    private String salesWebsit;
-
-    @ApiModelProperty(value = "费用类型")
-    private WebsitGoodsTypeEnum goodsType;
-
-    @ApiModelProperty(value = "客户名称")
-    private String customerName;
-
-    @ApiModelProperty(value = "联系人")
-    private String linkName;
-
-    @ApiModelProperty(value = "客户电话")
-    private String customerMobile;
-
-    @ApiModelProperty(value = "客户电话2")
-    private String customerMobile2;
-
-//    @ApiModelProperty(value = "省")
-//    private String province;
-//
-//    @ApiModelProperty(value = "省id")
-//    private String provinceId;
-//
-//    @ApiModelProperty(value = "市")
-//    private String city;
-//
-//    @ApiModelProperty(value = "市id")
-//    private String cityId;
-//
-//    @ApiModelProperty(value = "区")
-//    private String area;
-//
-//    @ApiModelProperty(value = "区id")
-//    private String areaId;
-//
-//    @ApiModelProperty(value = "街道")
-//    private String street;
-//
-//    @ApiModelProperty(value = "街道id")
-//    private String streetId;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "状态")
-    private EnginPayManageStatusEnum status;
-
-    @ApiModelProperty(value = "销售金额")
-    private BigDecimal totalSalesAmount;
-
-    @ApiModelProperty(value = "收款金额")
-    private BigDecimal totalPayAmount;
-
-    @ZfireField(isQuery = false, ignoreSelect = true)
-    @ApiModelProperty(value = "未收款金额")
-    private BigDecimal totalNotPayAmount;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date confirmTime;
-
-    @ApiModelProperty(value = "审核人")
-    private String confirmBy;
-
-    @ApiModelProperty(value = "最后收款时间")
-    private Date lastUpdateTime;
-
-    @ApiModelProperty(value = "最后收款人")
-    private String lastUpdateBy;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/OrderEnginBaseBean.java

@@ -1,112 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.plus.entity.OrderEnginBaseItem;
-import com.gree.mall.manager.plus.entity.OrderEnginBaseOperatorLog;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel
-public class OrderEnginBaseBean {
-
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    @ApiModelProperty(value = "商户id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名")
-    private String companyWechatName;
-
-    @NotBlank(message = "工程名称不能为空")
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-    @NotBlank(message = "工程编号不能为空")
-    @ApiModelProperty(value = "项目名称")
-    private String projectNo;
-
-    @NotBlank(message = "负责人不能为空")
-    @ApiModelProperty(value = "负责人")
-    private String manger;
-
-    @NotBlank(message = "联系电话不能为空")
-    @ApiModelProperty(value = "联系电话")
-    private String mobile;
-
-    @NotNull(message = "项目开始时间不能为空")
-    @ApiModelProperty(value = "项目开始时间")
-    private Date startTime;
-
-    @ApiModelProperty(value = "项目结束时间")
-    private Date endTime;
-
-    @NotBlank(message = "请选择费省")
-    @ApiModelProperty(value = "省")
-    private String province;
-
-    @NotBlank(message = "请选择费省")
-    @ApiModelProperty(value = "省id")
-    private String provinceId;
-
-    @NotBlank(message = "请选择费市")
-    @ApiModelProperty(value = "市")
-    private String city;
-
-    @NotBlank(message = "请选择费市")
-    @ApiModelProperty(value = "市id")
-    private String cityId;
-
-    @NotBlank(message = "请选择费区")
-    @ApiModelProperty(value = "区")
-    private String area;
-
-    @NotBlank(message = "请选择费区")
-    @ApiModelProperty(value = "区id")
-    private String areaId;
-
-    @NotBlank(message = "请选择街道")
-    @ApiModelProperty(value = "街道")
-    private String street;
-
-    @NotBlank(message = "请选择街道")
-    @ApiModelProperty(value = "街道id")
-    private String streetId;
-
-    @NotBlank(message = "详细地址不能为空")
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "项目说明")
-    private String remark;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "经度")
-    private String lng;
-
-    @ApiModelProperty(value = "纬度")
-    private String lat;
-
-    @ApiModelProperty(value = "明细")
-    private List<OrderEnginBaseItem> items;
-
-    @ApiModelProperty(value = "操作记录")
-    private List<OrderEnginBaseOperatorLog> operatorLogList;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/OrderEnginBaseVO.java

@@ -1,89 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class OrderEnginBaseVO {
-
-    @ZfireField(hide = true)
-    private String id;
-
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "商户id")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "商户名")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "工程名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "工程编号")
-    private String projectNo;
-
-    @ApiModelProperty(value = "负责人")
-    private String manger;
-
-    @ApiModelProperty(value = "联系电话")
-    private String mobile;
-
-    @ApiModelProperty(value = "项目开始时间")
-    private Date startTime;
-
-    @ApiModelProperty(value = "项目结束时间")
-    private Date endTime;
-
-    @ApiModelProperty(value = "省")
-    private String province;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "省id")
-    private String provinceId;
-
-    @ApiModelProperty(value = "市")
-    private String city;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "市id")
-    private String cityId;
-
-    @ApiModelProperty(value = "区")
-    private String area;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "区id")
-    private String areaId;
-
-    @ApiModelProperty(value = "街道")
-    private String street;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "街道id")
-    private String streetId;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "项目说明")
-    private String remark;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/ProjectRepairBean.java

@@ -1,138 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.plus.entity.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel
-public class ProjectRepairBean {
-
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    @ApiModelProperty(value = "商户id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名")
-    private String companyWechatName;
-
-    @NotBlank(message = "项目名称不能为空")
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-    @NotBlank(message = "负责人不能为空")
-    @ApiModelProperty(value = "负责人")
-    private String manger;
-
-    @NotBlank(message = "联系电话不能为空")
-    @ApiModelProperty(value = "联系电话")
-    private String mobile;
-
-    @NotNull(message = "维保开始时间不能为空")
-    @ApiModelProperty(value = "维保开始时间")
-    private Date startTime;
-
-    @NotNull(message = "维保结束时间不能为空")
-    @ApiModelProperty(value = "维保结束时间")
-    private Date endTime;
-
-    @ApiModelProperty(value = "工单类型id")
-    private String orderSmallType;
-
-//    @NotBlank(message = "请选择工单类型")
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallTypeText;
-
-    @NotBlank(message = "请选择包含全部费用")
-    @ApiModelProperty(value = "是否包含全部费用 YES=是 NO=否")
-    private String isAllFee;
-
-//    @NotBlank(message = "请选择费用支付方式")
-    @ApiModelProperty(value = "费用支付方式 EXAMINE=审批后结算 SITE=现场")
-    private String feePayMethod;
-
-    @NotBlank(message = "请选择费省")
-    @ApiModelProperty(value = "省")
-    private String province;
-
-    @NotBlank(message = "请选择费省")
-    @ApiModelProperty(value = "省id")
-    private String provinceId;
-
-    @NotBlank(message = "请选择费市")
-    @ApiModelProperty(value = "市")
-    private String city;
-
-    @NotBlank(message = "请选择费市")
-    @ApiModelProperty(value = "市id")
-    private String cityId;
-
-    @NotBlank(message = "请选择费区")
-    @ApiModelProperty(value = "区")
-    private String area;
-
-    @NotBlank(message = "请选择费区")
-    @ApiModelProperty(value = "区id")
-    private String areaId;
-
-    @NotBlank(message = "请选择街道")
-    @ApiModelProperty(value = "街道")
-    private String street;
-
-    @NotBlank(message = "请选择街道")
-    @ApiModelProperty(value = "街道id")
-    private String streetId;
-
-    @NotBlank(message = "详细地址不能为空")
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "项目说明")
-    private String remark;
-
-    @ApiModelProperty(value = "服务二维码")
-    private String serviceCode;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "项目设备")
-    private List<RpProjectRepairProduct> productList;
-
-    @ApiModelProperty(value = "项目人员")
-    private List<RpProjectRepairBy> byList;
-
-    @ApiModelProperty(value = "服务网点")
-    private List<RpProjectRepairWebsit> websitList;
-
-    @ApiModelProperty(value = "修改记录")
-    private List<RpProjectRepairOperatorLog> operatorLogList;
-
-    @ApiModelProperty(value = "配置明细")
-    private List<RpProjectRepairItem> itemList;
-
-    @ApiModelProperty(value = "工单类型")
-    private List<OrderSmallType> typeList;
-
-    @ApiModelProperty(value = "纬度")
-    private String lat;
-
-    @ApiModelProperty(value = "经度")
-    private String lng;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/ProjectRepairVO.java

@@ -1,110 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsYesNoEnum;
-import com.gree.mall.manager.enums.engin.FeePayMethodEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class ProjectRepairVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户id")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "项目名称")
-    private String projectName;
-
-    @ApiModelProperty(value = "负责人")
-    private String manger;
-
-    @ApiModelProperty(value = "联系电话")
-    private String mobile;
-
-    @ZfireField(type = "date")
-    @ApiModelProperty(value = "维保开始时间")
-    private Date startTime;
-
-    @ZfireField(type = "date")
-    @ApiModelProperty(value = "维保结束时间")
-    private Date endTime;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型名称")
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "包含全部费用")
-    private IsYesNoEnum isAllFee;
-
-    @ApiModelProperty(value = "费用支付方式")
-    private FeePayMethodEnum feePayMethod;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "省")
-    private String province;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "省id")
-    private String provinceId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "市")
-    private String city;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "市id")
-    private String cityId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "区")
-    private String area;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "区id")
-    private String areaId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "街道")
-    private String street;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "街道id")
-    private String streetId;
-
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ApiModelProperty(value = "项目说明")
-    private String remark;
-
-    @ApiModelProperty(value = "服务二维码")
-    private String serviceCode;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpMaterialOrderAllListVO.java

@@ -1,130 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.*;
-import com.gree.mall.manager.enums.engin.FeePayMethodEnum;
-import com.gree.mall.manager.enums.material.PayTypeEnum;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import com.gree.mall.manager.plus.entity.RpMaterialOrder;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-public class RpMaterialOrderAllListVO    {
-
-    @ApiModelProperty(value = "申请单号")
-    private String orderId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "品牌")
-    private String brand;
-
-    @ApiModelProperty(value = "客户名称")
-    private String userName;
-
-    @ApiModelProperty(value = "客户电话")
-    private String userMobile;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工程师编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "工程师名称")
-    private String workerName;
-
-    @ApiModelProperty(value = "工程师手机号")
-    private String workerMobile;
-
-    @ApiModelProperty(value = "身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "订单金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "申请人")
-    private String createBy;
-
-    @ApiModelProperty(value = "申请时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "工单单号")
-    private String workerOrderId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-
-    @ApiModelProperty(value = "商品类型")
-    private WebsitGoodsTypeEnum goodsType;
-
-    @ApiModelProperty(value = "产品数量")
-    private BigDecimal num;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "产品大类id")
-    private String categoryId;
-
-    @ApiModelProperty(value = "产品大类名称")
-    private String categoryName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "费用单状态")
-    private MaterialExamineStatusEnum examineStatus;
-
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "费用支付方式")
-    private FeePayMethodEnum feePayMethod;
-
-    @ApiModelProperty(value = "是否包含全部费用")
-    private IsYesNoEnum isAllFee;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "维保基础id")
-    private String rpProjectRepairId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String rpProjectRepairName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "支付类型")
-    private SettlementPayTypeEnum payType;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "结算状态")
-    private SettlementStatusEnum status;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpMaterialOrderAllVO.java

@@ -1,25 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.plus.entity.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class RpMaterialOrderAllVO extends RpMaterialOrder {
-
-    @ApiModelProperty(value = "item")
-    private List<RpMaterialOrderItem> rpMaterialOrderItems;
-
-    @ApiModelProperty(value = "工单师傅")
-    private List<PgOrderWorker> pgOrderWorkers;
-
-    @ApiModelProperty(value = "工单")
-    private PgOrderBase pgOrderBase;
-
-    @ApiModelProperty(value = "工单产品")
-    private List<PgOrderProduct> pgOrderProducts;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpMaterialOrderLineVO.java

@@ -1,131 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.*;
-import com.gree.mall.manager.enums.engin.FeePayMethodEnum;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-public class RpMaterialOrderLineVO {
-
-    @ApiModelProperty(value = "申请单号")
-    private String orderId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "品牌")
-    private String brand;
-
-    @ApiModelProperty(value = "客户名称")
-    private String userName;
-
-    @ApiModelProperty(value = "客户电话")
-    private String userMobile;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工程师编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "工程师名称")
-    private String workerName;
-
-    @ApiModelProperty(value = "工程师手机号")
-    private String workerMobile;
-
-    @ApiModelProperty(value = "身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "订单金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "申请人")
-    private String createBy;
-
-    @ApiModelProperty(value = "申请时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "支付状态")
-    private PayStatusEnum payStatus;
-
-    @ApiModelProperty(value = "工单单号")
-    private String workerOrderId;
-
-    @ApiModelProperty(value = "支付时间")
-    private Date payTime;
-
-    @ApiModelProperty(value = "微信流水号")
-    private String wechatOrder;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-
-    @ApiModelProperty(value = "商品类型")
-    private WebsitGoodsTypeEnum goodsType;
-
-    @ApiModelProperty(value = "产品数量")
-    private BigDecimal num;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "产品大类id")
-    private String categoryId;
-
-    @ApiModelProperty(value = "产品大类名称")
-    private String categoryName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "费用单状态")
-    private MaterialExamineStatusEnum examineStatus;
-
-
-    @ApiModelProperty(value = "费用支付方式")
-    private FeePayMethodEnum feePayMethod;
-
-    @ApiModelProperty(value = "是否包含全部费用")
-    private IsYesNoEnum isAllFee;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "维保基础id")
-    private String rpProjectRepairId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String rpProjectRepairName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "支付类型")
-    private SettlementPayTypeEnum payType;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "结算状态")
-    private SettlementStatusEnum status;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpMaterialOrderVO.java

@@ -1,134 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsYesNoEnum;
-import com.gree.mall.manager.enums.MaterialExamineStatusEnum;
-import com.gree.mall.manager.enums.SettlementPayTypeEnum;
-import com.gree.mall.manager.enums.SettlementStatusEnum;
-import com.gree.mall.manager.enums.engin.FeePayMethodEnum;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-public class RpMaterialOrderVO    {
-
-    @ApiModelProperty(value = "申请单号")
-    private String orderId;
-
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "品牌")
-    private String brand;
-
-    @ApiModelProperty(value = "客户名称")
-    private String userName;
-
-    @ApiModelProperty(value = "客户电话")
-    private String userMobile;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工程师编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "工程师名称")
-    private String workerName;
-
-    @ApiModelProperty(value = "工程师手机号")
-    private String workerMobile;
-
-    @ApiModelProperty(value = "身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "订单金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "申请人")
-    private String createBy;
-
-    @ApiModelProperty(value = "申请时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "工单单号")
-    private String workerOrderId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-
-    @ApiModelProperty(value = "商品类型")
-    private WebsitGoodsTypeEnum goodsType;
-
-    @ApiModelProperty(value = "产品数量")
-    private BigDecimal num;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "产品大类id")
-    private String categoryId;
-
-    @ApiModelProperty(value = "产品大类名称")
-    private String categoryName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "费用单状态")
-    private MaterialExamineStatusEnum examineStatus;
-
-    @ApiModelProperty(value = "审批时间")
-    private Date examineTime;
-
-    @ApiModelProperty(value = "审批人")
-    private String examineName;
-
-    @ApiModelProperty(value = "审批备注")
-    private String examineRemark;
-
-    @ApiModelProperty(value = "费用支付方式")
-    private FeePayMethodEnum feePayMethod;
-
-    @ApiModelProperty(value = "是否包含全部费用")
-    private IsYesNoEnum isAllFee;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "维保基础id")
-    private String rpProjectRepairId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String rpProjectRepairName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "支付类型")
-    private SettlementPayTypeEnum payType;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "结算状态")
-    private SettlementStatusEnum status;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpMaterialOrderWechatVO.java

@@ -1,132 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.*;
-import com.gree.mall.manager.enums.engin.FeePayMethodEnum;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-public class RpMaterialOrderWechatVO    {
-
-    @ApiModelProperty(value = "申请单号")
-    private String orderId;
-
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "品牌")
-    private String brand;
-
-    @ApiModelProperty(value = "客户名称")
-    private String userName;
-
-    @ApiModelProperty(value = "客户电话")
-    private String userMobile;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工程师编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "工程师名称")
-    private String workerName;
-
-    @ApiModelProperty(value = "工程师手机号")
-    private String workerMobile;
-
-    @ApiModelProperty(value = "身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "订单金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "申请人")
-    private String createBy;
-
-    @ApiModelProperty(value = "申请时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "支付状态")
-    private PayStatusEnum payStatus;
-
-    @ApiModelProperty(value = "工单单号")
-    private String workerOrderId;
-
-    @ApiModelProperty(value = "支付时间")
-    private Date payTime;
-
-    @ApiModelProperty(value = "微信流水号")
-    private String wechatOrder;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-
-    @ApiModelProperty(value = "商品类型")
-    private WebsitGoodsTypeEnum goodsType;
-
-    @ApiModelProperty(value = "产品数量")
-    private BigDecimal num;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "产品大类id")
-    private String categoryId;
-
-    @ApiModelProperty(value = "产品大类名称")
-    private String categoryName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型")
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "费用单状态")
-    private MaterialExamineStatusEnum examineStatus;
-
-
-
-    @ApiModelProperty(value = "费用支付方式")
-    private FeePayMethodEnum feePayMethod;
-
-    @ApiModelProperty(value = "是否包含全部费用")
-    private IsYesNoEnum isAllFee;
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "维保基础id")
-    private String rpProjectRepairId;
-
-    @ApiModelProperty(value = "项目名称")
-    private String rpProjectRepairName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "支付类型")
-    private SettlementPayTypeEnum payType;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "结算状态")
-    private SettlementStatusEnum status;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/RpmaterialOrderDetail.java

@@ -1,27 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.plus.entity.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class RpmaterialOrderDetail extends RpMaterialOrder {
-
-
-    @ApiModelProperty(value = "item")
-    private List<RpMaterialOrderItem> rpMaterialOrderItems;
-
-    @ApiModelProperty(value = "工单师傅")
-    private List<PgOrderWorker> pgOrderWorkers;
-
-    @ApiModelProperty(value = "工单")
-    private PgOrderBase pgOrderBase;
-
-    @ApiModelProperty(value = "工单产品")
-    private List<PgOrderProduct> pgOrderProducts;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/WebsitSalesManagerDetail.java

@@ -1,15 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.gree.mall.manager.plus.entity.OrderEnginBase;
-import com.gree.mall.manager.plus.entity.WebsitSalesManager;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class WebsitSalesManagerDetail extends WebsitSalesManager {
-
-    @ApiModelProperty(value = "工程")
-    private OrderEnginBase orderEnginBase;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/WebsitSalesManagerVO.java

@@ -1,129 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.ExamineStatusManagerEnum;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitSalesManagerVO     {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "单号")
-    @TableId(value = "websit_sales_manager_id", type = IdType.ID_WORKER_STR)
-    private String websitSalesManagerId;
-
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "工程机编号")
-    private String orderEnginBaseId;
-
-    @ApiModelProperty(value = "商品类型")
-    private WebsitGoodsTypeEnum goodsType;
-
-    @ApiModelProperty(value = "状态")
-    private ExamineStatusManagerEnum status;
-
-    @ApiModelProperty(value = "销售数量")
-    private Integer salesNum;
-
-    @ApiModelProperty(value = "销售金额")
-    private BigDecimal salesPrice;
-
-    @ApiModelProperty(value = "退货数量")
-    private Integer retNum;
-
-    @ApiModelProperty(value = "退货金额")
-    private BigDecimal retPrice;
-
-    @ApiModelProperty(value = "应收金额")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "已收金额")
-    private BigDecimal givePrice;
-
-    @ApiModelProperty(value = "待收金额")
-    private BigDecimal waitPrice;
-
-    @ApiModelProperty(value = "创建人")
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-
-
-
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "工程名称")
-    private String projectName;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "负责人")
-    private String manger;
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "联系电话")
-    private String mobile;
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "项目开始时间")
-    private Date startTime;
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "项目结束时间")
-    private Date endTime;
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "省")
-    private String province;
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "市")
-    private String city;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "区")
-    private String area;
-
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "街道")
-    private String street;
-
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "详细地址")
-    private String address;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "项目说明")
-    private String remark;
-
-
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/engin/WorkerMaterialSettlementVO.java

@@ -1,62 +0,0 @@
-package com.gree.mall.manager.bean.engin;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.SettlementPayTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@ApiModel
-public class WorkerMaterialSettlementVO {
-
-    @ZfireField(hide = true)
-    @TableId(value = "id", type = IdType.ID_WORKER_STR)
-    private String id;
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "工程师编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "工程师名称")
-    private String workerName;
-
-    @ApiModelProperty(value = "工程师手机号")
-    private String workerMobile;
-
-    @ApiModelProperty(value = "身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "订单金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "订单总数量")
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "上缴金额")
-    private BigDecimal giveAmount;
-
-
-    @ApiModelProperty(value = "网点分账金额")
-    private BigDecimal websitAmount;
-
-    @ApiModelProperty(value = "支付方式")
-    private SettlementPayTypeEnum payType;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/es/ESGoodsBean.java

@@ -1,30 +0,0 @@
-package com.gree.mall.manager.bean.es;
-
-import com.gree.mall.manager.plus.entity.EsGoods;
-import com.gree.mall.manager.plus.entity.EsGoodsImg;
-import com.gree.mall.manager.plus.entity.EsGoodsOperateRecord;
-import com.gree.mall.manager.plus.entity.EsOrderInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class ESGoodsBean extends EsGoods {
-
-    @ApiModelProperty(value = "图片列表")
-    private List<EsGoodsImg> imgList;
-
-    @ApiModelProperty(value = "留言列表")
-    private List<EsGoodsMessageVO> messageList;
-
-    @ApiModelProperty(value = "操作记录列表")
-    private List<EsGoodsOperateRecord> operateRecordList;
-
-    @ApiModelProperty(value = "订单")
-    private EsOrderInfo esOrderInfo;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/esOrder/EsOrderAddBean.java

@@ -1,20 +0,0 @@
-package com.gree.mall.manager.bean.esOrder;
-
-import com.gree.mall.manager.plus.entity.EsOrderInfo;
-import com.gree.mall.manager.plus.entity.OrderInfo;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class EsOrderAddBean extends EsOrderInfo {
-
-
-    @ApiModelProperty(value = "明细")
-    private List<EsOrderInfo> esOrderInfos;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/esOrder/EsOrderRefundBean.java

@@ -1,18 +0,0 @@
-package com.gree.mall.manager.bean.esOrder;
-
-import com.gree.mall.manager.plus.entity.EsOrderInfo;
-import com.gree.mall.manager.plus.entity.EsOrderRefund;
-import com.gree.mall.manager.plus.entity.EsOrderRefundFile;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class EsOrderRefundBean extends EsOrderRefund {
-
-    @ApiModelProperty(value = "凭证")
-    private List<EsOrderRefundFile> esOrderRefundFiles;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/marketing/DynamicMaterialsDetailsBean.java

@@ -1,28 +0,0 @@
-package com.gree.mall.manager.bean.marketing;
-
-import com.gree.mall.manager.plus.entity.MarketingMaterials;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class DynamicMaterialsDetailsBean extends MarketingMaterials {
-
-    @ApiModelProperty("总点击次数")
-    private Integer totalCount;
-
-    @ApiModelProperty("总点击人数")
-    private Integer totalUserCount;
-
-    @ApiModelProperty("今日点击数")
-    private Integer todayCount;
-
-    @ApiModelProperty("今日点击人数")
-    private Integer todayUserCount;
-
-    @ApiModelProperty("客户浏览记录")
-    List<DynamicMaterialsVisitStatisticsBean> visitList;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/marketing/DynamicMaterialsPageBean.java

@@ -1,23 +0,0 @@
-package com.gree.mall.manager.bean.marketing;
-
-import com.gree.mall.manager.plus.entity.AdminUser;
-import com.gree.mall.manager.plus.entity.MarketingMaterials;
-import com.gree.mall.manager.plus.entity.Tag;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 动态素材分页bean
- */
-@ApiModel
-@Data
-public class DynamicMaterialsPageBean extends MarketingMaterials {
-
-    @ApiModelProperty("标签")
-    private List<Tag> tags;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/marketing/DynamicMaterialsVisitStatisticsBean.java

@@ -1,26 +0,0 @@
-package com.gree.mall.manager.bean.marketing;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@ApiModel
-@Data
-public class DynamicMaterialsVisitStatisticsBean {
-
-
-
-    @ApiModelProperty("客户名称")
-    private String username;
-
-    @ApiModelProperty("所属员工名称")
-    private String adminUsername;
-
-    @ApiModelProperty("最近点击时间")
-    private Date newTime;
-
-    @ApiModelProperty("总点击次数")
-    private Integer totalCount;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/marketing/MarketingMaterialsAddReqBean.java

@@ -1,30 +0,0 @@
-package com.gree.mall.manager.bean.marketing;
-
-import com.gree.mall.manager.plus.entity.CommonFile;
-import com.gree.mall.manager.plus.entity.MarketingMaterials;
-import com.gree.mall.manager.plus.entity.Tag;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 营销素材addReq bean
- */
-@ApiModel
-@Data
-public class MarketingMaterialsAddReqBean extends MarketingMaterials {
-
-
-    @ApiModelProperty(value = "标签")
-    private List<Tag> tag;
-
-
-//
-//
-//    @ApiModelProperty(value = "封面图片")
-//    private CommonFile showImage;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/marketing/MarketingMaterialsUpdateReqBean.java

@@ -1,22 +0,0 @@
-package com.gree.mall.manager.bean.marketing;
-
-import com.gree.mall.manager.plus.entity.CommonFile;
-import com.gree.mall.manager.plus.entity.MarketingMaterials;
-import com.gree.mall.manager.plus.entity.Tag;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 营销素材addReq bean
- */
-@ApiModel
-@Data
-public class MarketingMaterialsUpdateReqBean extends MarketingMaterials {
-
-    @ApiModelProperty(value = "标签")
-    private List<Tag> tag;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/MaterialCategoryTree.java

@@ -1,36 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class MaterialCategoryTree {
-
-    @ApiModelProperty(value = "id")
-    private String categoryId;
-    @ApiModelProperty(value = "分类名称")
-    private String categoryName;
-    @ApiModelProperty(value = "父id")
-    private String parentCategoryId;
-
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "状态  ON=有效 OFF=无效")
-    private String status;
-
-    private List<MaterialCategoryTree> child;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/MaterialCategoryVO.java

@@ -1,53 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.CategoryLevelEnum;
-import com.gree.mall.manager.enums.material.StateEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class MaterialCategoryVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "分类编号")
-    private String categoryId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "父分类编号")
-    private String parentCategoryId;
-
-    @ApiModelProperty(value = "分类名称")
-    private String categoryName;
-
-    @ApiModelProperty(value = "级别")
-    private CategoryLevelEnum categoryLevel;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "排序")
-    private Integer sort;
-
-    @ApiModelProperty(value = "状态")
-    private StateEnum status;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/PartsBaseVO.java

@@ -1,46 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.PartBaseTypeEnum;
-import com.gree.mall.manager.enums.material.StateEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class PartsBaseVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    @ZfireField(isQuery = false)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "类型")
-    private PartBaseTypeEnum type;
-
-    @ApiModelProperty(value = "配件值")
-    private String value;
-
-    @ApiModelProperty(value = "状态")
-    private StateEnum status;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsAloneBean.java

@@ -1,65 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-public class WebsitGoodsAloneBean {
-
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "商品类型 M=辅材 P=配件")
-    private String goodsType;
-
-    @ApiModelProperty(value = "收费类型 M=物料收费 S=服务收费")
-    private String normType;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "分类名称")
-    private String categoryName;
-
-    @ApiModelProperty(value = "单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty(value = "规格型号")
-    private String goodsSpecification;
-
-    @ApiModelProperty(value = "状态 ON=有效 OFF=无效")
-    private String status;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "销售价格")
-    private BigDecimal marketPrice;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsAloneMVO.java

@@ -1,60 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.StateEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitGoodsAloneMVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "分类名称")
-    private String categoryName;
-
-    @ApiModelProperty(value = "辅材名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "规格型号")
-    private String goodsSpecification;
-
-    @ApiModelProperty(value = "状态")
-    private StateEnum status;
-
-    @ApiModelProperty(value = "销售价格")
-    private BigDecimal marketPrice;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsAlonePVO.java

@@ -1,58 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.StateEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitGoodsAlonePVO {
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-    @ApiModelProperty(value = "配件编码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "配件名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "单位")
-    private String goodsStockUnit;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "规格型号")
-    private String goodsSpecification;
-
-    @ApiModelProperty(value = "状态")
-    private StateEnum status;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "销售价格")
-    private BigDecimal marketPrice;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsBean.java

@@ -1,140 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel
-public class WebsitGoodsBean {
-
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "商品类型 M=辅材 P=配件")
-    private String goodsType;
-
-    @ApiModelProperty(value = "收费类型 M=物料收费 S=服务收费")
-    private String normType;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "商品条码")
-    private String goodsBarcodeId;
-
-    @ApiModelProperty(value = "商品父类编号")
-    private String parentCategoryId;
-
-    @ApiModelProperty(value = "商品小类编号")
-    private String goodsCategoryId;
-
-    @ApiModelProperty(value = "简拼")
-    private String goodsSpell;
-
-    @ApiModelProperty(value = "规格型号")
-    private String goodsSpecification;
-
-    @ApiModelProperty(value = "库存单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty(value = "销售单位")
-    private String goodsSalesUnit;
-
-    @ApiModelProperty(value = "销售单位转换系数")
-    private BigDecimal goodsSalesConvertQty;
-
-    @ApiModelProperty(value = "转换数保留小数位（以0舍1入方式保留）")
-    private Integer convertBitScale;
-
-    @ApiModelProperty(value = "图片")
-    private String goodsImage;
-
-    @ApiModelProperty(value = "状态 ON=有效 OFF=无效")
-    private String status;
-
-    @ApiModelProperty(value = "是否入师傅库存 NO=否 YES=是")
-    private String manageWorkerStock;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "采购价格")
-    private BigDecimal cost;
-
-    @ApiModelProperty(value = "销售价格")
-    private BigDecimal marketPrice;
-
-    @ApiModelProperty(value = "收费标准")
-    private BigDecimal normAmount;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "配件类型")
-    private String partType;
-
-    @ApiModelProperty(value = "自有库存师傅分账金额")
-    private BigDecimal selfWorkerAmount;
-
-    @ApiModelProperty(value = "自有库存网点分账金额")
-    private BigDecimal selfWebsitAmount;
-
-    @ApiModelProperty(value = "自有库存师傅分账金额")
-    private BigDecimal outWorkerAmount;
-
-    @ApiModelProperty(value = "自有库存网点分账金额")
-    private BigDecimal outWebsitAmount;
-
-    @ApiModelProperty(value = "品牌")
-    List<String> brandList;
-
-    @ApiModelProperty(value = "产品大类")
-    List<String> categoryList;
-
-    @ApiModelProperty(value = "进价范围最小")
-    private BigDecimal costRangeMini;
-
-    @ApiModelProperty(value = "进价范围最大")
-    private BigDecimal costRangeMax;
-
-    @ApiModelProperty(value = "优惠价1")
-    private BigDecimal firstPrice;
-
-    @ApiModelProperty(value = "优惠价2")
-    private BigDecimal secondPrice;
-
-    @ApiModelProperty(value = "是否首选配件 false=非首选配件 true=首选配件")
-    private Boolean isHeadParts;
-
-    @ApiModelProperty(value = "返厂方式")
-    private String refundFactoryMode;
-
-    @ApiModelProperty(value = "物料组名称")
-    private String materialGroupName;
-
-    @ApiModelProperty(value = "辅材限制售价倍数")
-    private BigDecimal limitPriceMultiples;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsMVO.java

@@ -1,101 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsYesNoEnum;
-import com.gree.mall.manager.enums.material.StateEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitGoodsMVO {
-
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
-
-//    @ApiModelProperty(value = "商品条码")
-//    private String goodsBarcodeId;
-
-    @ZfireField(hide = true, tbName = "b", colName = "parent_category_id")
-    @ApiModelProperty(value = "商品父类编号")
-    private String parentCategoryId;
-
-    @ZfireField(tbName = "b", colName = "parent_category_name")
-    @ApiModelProperty(value = "父类名称")
-    private String parentCategoryName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商品小类编号")
-    private String goodsCategoryId;
-
-    @ZfireField(tbName = "b", colName = "category_name")
-    @ApiModelProperty(value = "分类名称")
-    private String categoryName;
-
-    @ApiModelProperty(value = "简拼")
-    private String goodsSpell;
-
-    @ApiModelProperty(value = "规格型号")
-    private String goodsSpecification;
-
-    @ApiModelProperty(value = "单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty(value = "采购价格")
-    private BigDecimal cost;
-
-    @ApiModelProperty(value = "销售价格")
-    private BigDecimal marketPrice;
-
-//    @ApiModelProperty(value = "销售单位")
-//    private String goodsSalesUnit;
-//
-    @ApiModelProperty(value = "销售单位转换系数")
-    private BigDecimal goodsSalesConvertQty;
-//
-//    @ApiModelProperty(value = "转换数保留小数位（以0舍1入方式保留）")
-//    private Integer convertBitScale;
-
-    @ApiModelProperty(value = "图片")
-    private String goodsImage;
-
-    @ApiModelProperty(value = "状态")
-    private StateEnum status;
-
-//    @ZfireField(hide = true)
-    @ApiModelProperty(value = "是否入师傅库存")
-    private IsYesNoEnum manageWorkerStock;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ZfireField(ignoreSelect = true, hide = true)
-    @ApiModelProperty(value = "库存数量")
-    private BigDecimal stockQty;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitGoodsPVO.java

@@ -1,95 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.NormTypeEnum;
-import com.gree.mall.manager.enums.material.StateEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitGoodsPVO {
-
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "配件编码")
-    private String goodsCode;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "规格型号")
-    private String goodsSpecification;
-
-    @ApiModelProperty(value = "单位")
-    private String goodsStockUnit;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "图片")
-    private String goodsImage;
-
-    @ApiModelProperty(value = "状态")
-    private StateEnum status;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "品牌名称")
-    private String brandRelaName;
-
-    @ApiModelProperty(value = "产品名称")
-    private String productRelaName;
-
-    @ApiModelProperty(value = "收费类型")
-    private NormTypeEnum normType;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "采购价格")
-    private BigDecimal cost;
-
-    @ApiModelProperty(value = "销售价格")
-    private BigDecimal marketPrice;
-
-//    @ApiModelProperty(value = "收费标准")
-//    private BigDecimal normAmount;
-//
-//    @ApiModelProperty(value = "自有库存师傅分账金额(师傅分账比例)")
-//    private BigDecimal selfWorkerAmount;
-//
-//    @ApiModelProperty(value = "自有库存商户分账金额(商户分账比例)")
-//    private BigDecimal selfWebsitAmount;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-//    @ZfireField(tbName = "b", colName = "b.brand_name")
-//    @ApiModelProperty(value = "适用品牌")
-//    private String brandName;
-//
-//    @ZfireField(tbName = "c", colName = "c.category_name")
-//    @ApiModelProperty(value = "适用产品大类")
-//    private String categoryName;
-
-    @ZfireField(ignoreSelect = true, hide = true)
-    @ApiModelProperty(value = "库存数量")
-    private BigDecimal stockQty;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitNormChargeBean.java

@@ -1,19 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.plus.entity.WebsitNormCharge;
-import com.gree.mall.manager.plus.entity.WebsitNormRela;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class WebsitNormChargeBean extends WebsitNormCharge {
-
-    @ApiModelProperty(value = "收费标准编号")
-    private List<WebsitNormRela> items;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WebsitNormChargeVO.java

@@ -1,76 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.NormTypeEnum;
-import com.gree.mall.manager.enums.material.StateEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitNormChargeVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "收费标准编号")
-    private String normId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "辅材名称")
-    private String normName;
-
-    @ApiModelProperty(value = "商品代码")
-    private String normCode;
-
-    @ZfireField(hide = true, tbName = "b", colName = "parent_category_name")
-    @ApiModelProperty(value = "父类编号")
-    private String parentCategoryId;
-
-    @ZfireField(tbName = "b", colName = "parent_category_name")
-    @ApiModelProperty(value = "大类名称")
-    private String parentCategoryName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "小类编号")
-    private String categoryId;
-
-    @ZfireField(tbName = "b", colName = "category_name")
-    @ApiModelProperty(value = "小类名称")
-    private String categoryName;
-
-    @ApiModelProperty(value = "规格型号")
-    private String specification;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-    @ApiModelProperty(value = "收费类型")
-    private NormTypeEnum normType;
-
-    @ApiModelProperty(value = "收费标准")
-    private BigDecimal normAmount;
-
-    @ApiModelProperty(value = "状态")
-    private StateEnum status;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WorkerGoodsBean.java

@@ -1,19 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.plus.entity.WorkerGoods;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class WorkerGoodsBean extends WorkerGoods {
-
-    @ApiModelProperty(value = "明细")
-    private List<WorkerGoodsRelaBean> items;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WorkerGoodsRelaBean.java

@@ -1,16 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.plus.entity.WorkerGoodsRela;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@ApiModel
-@Data
-public class WorkerGoodsRelaBean extends WorkerGoodsRela {
-
-    @ApiModelProperty(value = "是否入师傅库存")
-    private String manageWorkerStock;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WorkerGoodsRelaExportBean.java

@@ -1,51 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel
-public class WorkerGoodsRelaExportBean {
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "小类名称")
-    private String goodsCategoryName;
-
-    @ApiModelProperty(value = "师傅辅材编号")
-    private String goodsId;
-
-    @ApiModelProperty(value = "师傅辅材名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "是否小件")
-    private Boolean isSmall;
-
-    @ApiModelProperty(value = "状态")
-    private String status;
-
-    @ApiModelProperty(value = "网点辅材小类")
-    private String websitCategoryName;
-
-    @ApiModelProperty(value = "网点辅材编号")
-    private String websitGoodsId;
-
-    @ApiModelProperty(value = "网点辅材名称")
-    private String websitGoodsName;
-
-    @ApiModelProperty(value = "规格")
-    private String specification;
-
-    @ApiModelProperty(value = "转换系数")
-    private String goodsSalesConvertQty;
-
-    @ApiModelProperty(value = "是否入师傅库存")
-    private String manageWorkerStock;
-
-    @ApiModelProperty(value = "网点辅材状态")
-    private String websitGoodsStatus;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/base/WorkerGoodsVO.java

@@ -1,69 +0,0 @@
-package com.gree.mall.manager.bean.material.base;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsEnum;
-import com.gree.mall.manager.enums.material.StateEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WorkerGoodsVO {
-
-    @ZfireField(isQuery = false)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "师傅辅材编号")
-    private String goodsId;
-
-    @ApiModelProperty(value = "师傅辅材名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "师傅销售单位")
-    private String salesUnit;
-
-    @ZfireField(tbName = "b", hide = true)
-    @ApiModelProperty(value = "父级商品分类ID")
-    private String parentCategoryId;
-
-    @ZfireField(tbName = "b", hide = true)
-    @ApiModelProperty(value = "父级商品分类名称")
-    private String parentCategoryName;
-
-    @ZfireField(tbName = "b", hide = true)
-    @ApiModelProperty(value = "商品小类ID")
-    private String categoryId;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "商品小类")
-    private String categoryName;
-
-//    @ApiModelProperty(value = "商品代码")
-//    private String goodsCode;
-
-    @ApiModelProperty(value = "是否小件")
-    private IsEnum isSmall;
-
-    @ApiModelProperty(value = "状态")
-    private StateEnum status;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/ImportMaterialSalesBean.java

@@ -1,22 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.User;
-import com.gree.mall.manager.plus.entity.WebsitGoods;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class ImportMaterialSalesBean {
-
-    private int index;
-    private AdminWebsit adminWebsit;
-    private User user;
-    private WebsitGoods goods;
-    private BigDecimal qty;
-    private BigDecimal price;
-    private String salesId;
-    private String storageId;
-    private BigDecimal origPrice;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/ImportResultBean.java

@@ -1,18 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class ImportResultBean {
-
-    @ApiModelProperty(value = "待处理数量")
-    private int waitCount;
-
-    @ApiModelProperty(value = "错误结果集")
-    private List<String> errList;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/PartsApplyBean.java

@@ -1,19 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.plus.entity.WebsitPartsApply;
-import com.gree.mall.manager.plus.entity.WebsitPartsApplyItem;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class PartsApplyBean extends WebsitPartsApply {
-
-    @ApiModelProperty(value = "明细")
-    private List<WebsitPartsApplyItem> items;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitGoodsPriceVO.java

@@ -1,55 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitGoodsPriceVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商品价格id")
-    private String id;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "商品类型")
-    private WebsitGoodsTypeEnum goodsType;
-
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-    @ZfireField(tbName = "b", colName = "goods_name")
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "售价")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "调价单号")
-    private String sheetId;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitMPurchaseBean.java

@@ -1,104 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel
-public class WebsitMPurchaseBean {
-
-    @ApiModelProperty(value = "单号")
-    private String purchaseId;
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "商品类型")
-    private String goodsType;
-
-    @ApiModelProperty(value = "供应商编号")
-    private String venderId;
-
-    @ApiModelProperty(value = "供应商名称")
-    private String venderName;
-
-    @ApiModelProperty(value = "仓储id")
-    private String storageId;
-
-    @ApiModelProperty(value = "仓储名称")
-    private String storageName;
-
-    @ApiModelProperty(value = "采购日期")
-    private Date purchaseTime;
-
-    @ApiModelProperty(value = "附件地址")
-    private String imageUrl;
-
-    @ApiModelProperty(value = "采购总金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "单据状态 SAVE=保存 OK=通过 FAIL=失败")
-    private String flag;
-
-    @ApiModelProperty(value = "是否核实")
-    private String isRecheck;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "核实备注")
-    private String checkRemark;
-
-    @ApiModelProperty(value = "审核备注")
-    private String confirmRemark;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "审核人")
-    private String confirmBy;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date confirmTime;
-
-    @ApiModelProperty(value = "提交人")
-    private String submitBy;
-
-    @ApiModelProperty(value = "提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty(value = "核实人")
-    private String checkBy;
-
-    @ApiModelProperty(value = "核实时间")
-    private Date checkTime;
-
-    @ApiModelProperty(value = "是否导入数据 true=是 false=否")
-    private Boolean isImport;
-
-    @ApiModelProperty(value = "明细")
-    List<WebsitMPurchaseItemBean> items;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitMPurchaseItemBean.java

@@ -1,90 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@ApiModel
-public class WebsitMPurchaseItemBean {
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "单号")
-    private String purchaseId;
-
-    @ApiModelProperty(value = "商品类型 M=辅材 P=配件")
-    private String goodsType;
-
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "预估进价")
-    private BigDecimal applyCost;
-
-    @ApiModelProperty(value = "预估进价金额")
-    private BigDecimal applyCostValue;
-
-    @ApiModelProperty(value = "申请数量")
-    private BigDecimal applyQty;
-
-    @ApiModelProperty(value = "核实数量")
-    private BigDecimal checkQty;
-
-    @ApiModelProperty(value = "进价")
-    private BigDecimal cost;
-
-    @ApiModelProperty(value = "验收金额")
-    private BigDecimal costValue;
-
-    @ApiModelProperty(value = "验收数量")
-    private BigDecimal recQty;
-
-    @ApiModelProperty(value = "验收赠品数量")
-    private BigDecimal recGiftQty;
-
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "库存单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty(value = "规格型号")
-    private String goodsSpecification;
-
-    @ApiModelProperty(value = "商品父类编号")
-    private String parentCategoryId;
-
-    @ApiModelProperty(value = "商品父类名称")
-    private String parentCategoryName;
-
-    @ApiModelProperty(value = "商品小类编号")
-    private String goodsCategoryId;
-
-    @ApiModelProperty(value = "商品小类名称")
-    private String goodsCategoryName;
-
-    @ApiModelProperty(value = "退货数量")
-    private BigDecimal retQty;
-
-    @ApiModelProperty(value = "备注")
-    private String note;
-
-    @ApiModelProperty(value = "入库数量")
-    private BigDecimal inStockQty;
-
-    @ApiModelProperty(value = "入库进价")
-    private BigDecimal inStockCost;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitNewInListBean.java

@@ -1,125 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel
-@Data
-public class WebsitNewInListBean {
-
-    @ApiModelProperty("id")
-    private String id;
-
-    @ApiModelProperty("凭证号")
-    private String voucherNo;
-
-    @ApiModelProperty("申请单号")
-    private String applyNo;
-
-    @ApiModelProperty("开单备注")
-    private String remark;
-
-    @ApiModelProperty("事物类型")
-    private String objectType;
-
-    @ApiModelProperty("配件编码")
-    private String partsNumber;
-
-    @ApiModelProperty("配件名称")
-    private String partsName;
-
-    @ApiModelProperty("物料组名称")
-    private String materialGroupName;
-
-    @ApiModelProperty("单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty("单价")
-    private BigDecimal price;
-
-    @ApiModelProperty("数量")
-    private BigDecimal qty;
-
-    @ApiModelProperty("新件编码(退旧件)")
-    private String newNo;
-
-    @ApiModelProperty("原价价格")
-    private BigDecimal primaryPrice;
-
-    @ApiModelProperty("折扣价格")
-    private BigDecimal discPrice;
-
-    @ApiModelProperty("优惠价格(实收)")
-    private BigDecimal realPrice;
-
-    @ApiModelProperty("新旧差价")
-    private BigDecimal diffPrice;
-
-    @ApiModelProperty("发出单位")
-    private String sendUnit;
-
-    @ApiModelProperty("领入单位")
-    private String receiveUnit;
-
-    @ApiModelProperty("发出网点编号")
-    private String sendShopId;
-
-    @ApiModelProperty("发出网点名称")
-    private String sendShopName;
-
-    @ApiModelProperty("发出配件网点编号")
-    private String sendPartsWebsiteNumber;
-
-    @ApiModelProperty("领入网点编号")
-    private String receiveShopId;
-
-    @ApiModelProperty("领入网点名称")
-    private String receiveShopName;
-
-    @ApiModelProperty("领入配件网点编号")
-    private String receivePartsWebsiteNumber;
-
-    @ApiModelProperty("开单日期")
-    private Date orderDate;
-
-    @ApiModelProperty("系统序号")
-    private String sysNo;
-
-    @ApiModelProperty("验收日期")
-    private Date receiveDate;
-
-    @ApiModelProperty("开单人")
-    private String operateBy;
-
-    @ApiModelProperty("发出单位区域")
-    private String sendUnitArea;
-
-    @ApiModelProperty("领入单位区域")
-    private String receiveUnitArea;
-
-    @ApiModelProperty("维修自编号")
-    private String repairCustomNo;
-
-    @ApiModelProperty("导入日期")
-    private Date importDate;
-
-    @ApiModelProperty("验收状态")
-    private String status;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("验收人")
-    private String checkBy;
-
-    @ApiModelProperty("验收时间")
-    private Date checkTime;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsChangeSalesBean.java

@@ -1,18 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.plus.entity.WebsitPartsChangeSales;
-import com.gree.mall.manager.plus.entity.WebsitPartsChangeSalesItem;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class WebsitPartsChangeSalesBean extends WebsitPartsChangeSales {
-
-    @ApiModelProperty("转销售明细")
-    private List<WebsitPartsChangeSalesItem> partsChangeSalesItemList;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsChangeSalesVO.java

@@ -1,88 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.PartsOrderFlagEnum;
-import com.gree.mall.manager.enums.material.PartsRefTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPartsChangeSalesVO {
-
-    @ApiModelProperty(value = "转销单号")
-    private String changeSalesNo;
-
-    @ApiModelProperty(value = "配件销售订单号")
-    private String salesId;
-
-    @ApiModelProperty(value = "转单类型")
-    private PartsRefTypeEnum changeType;
-
-    @ApiModelProperty(value = "总金额")
-    private BigDecimal totalAmount;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编码")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "网点编码")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "配件网点编号")
-    private String partsWebsitId;
-
-    @ApiModelProperty(value = "师傅身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "师傅编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称")
-    private String workerName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "销售单流程结束时间")
-    private Date salesEndTime;
-
-    @ApiModelProperty(value = "审批备注")
-    private String examineRemark;
-
-    @ApiModelProperty(value = "单据状态")
-    private PartsOrderFlagEnum flag;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "提交人")
-    private String submitBy;
-
-    @ApiModelProperty(value = "提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty(value = "审核人")
-    private String examineBy;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date examineTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsConfigBean.java

@@ -1,24 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.plus.entity.WebsitPartsRefundConfig;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-@EqualsAndHashCode(callSuper = true)
-@ApiModel
-@Data
-public class WebsitPartsConfigBean extends WebsitPartsRefundConfig {
-
-    @ApiModelProperty(value = "空调倍数")
-    private BigDecimal priceRate1;
-
-    @ApiModelProperty(value = "冰箱倍数")
-    private BigDecimal priceRate2;
-
-    @ApiModelProperty(value = "生活电器倍数")
-    private BigDecimal priceRate3;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsConfigVO.java

@@ -1,64 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPartsConfigVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "id")
-    private String id;
-
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "新件返还（市区）")
-    private Integer newRefundInner;
-
-    @ApiModelProperty(value = "新件返还（外区）")
-    private Integer newRefundOutside;
-
-    @ApiModelProperty(value = "旧件返还")
-    private Integer oldRefund;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "空调倍数")
-    private BigDecimal priceRate1;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "冰箱倍数")
-    private BigDecimal priceRate2;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty(value = "生活电器倍数")
-    private BigDecimal priceRate3;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "是否默认")
-    private IsEnum isDefault;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsCreditBean.java

@@ -1,87 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.plus.entity.WebsitPartsSalesItem;
-import com.gree.mall.manager.plus.entity.WebsitSalesPayOrder;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@ApiModel
-@Data
-public class WebsitPartsCreditBean {
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "购买方 WORKER=师傅 CUSTOMER=外部客户")
-    private String buyPeople;
-
-    @ApiModelProperty(value = "师傅身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "师傅编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称")
-    private String workerName;
-
-    @ApiModelProperty(value = "申请类别")
-    private String applyCategory;
-
-    @ApiModelProperty(value = "申请类型 0-普通申请 1-急件申请 2-备件申请")
-    private Integer applyType;
-
-    @ApiModelProperty(value = "发货方式 0-快递 1-自提")
-    private Integer deliveryType;
-
-    @ApiModelProperty(value = "联系电话")
-    private String mobile;
-
-    @ApiModelProperty(value = "接收单位")
-    private String receiveUnit;
-
-    @ApiModelProperty(value = "发货单位")
-    private String deliveryUnit;
-
-    @ApiModelProperty(value = "收件地址")
-    private String receiveAddr;
-
-    @ApiModelProperty(value = "收件地址-详细地址")
-    private String addr;
-
-    @ApiModelProperty(value = "单据来源 ONLINE=在线订单 SELF=自建订单")
-    private String orderSource;
-
-    @ApiModelProperty(value = "订单金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "支付方式 CASH=现金  ALLINPAY=通联 CREDIT=记账")
-    private String payType;
-
-    @ApiModelProperty(value = "下单时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "应收金额")
-    private BigDecimal itemTotalAmount;
-
-    @ApiModelProperty(value = "收款状态 true=已收款  false=未收款")
-    private Boolean creditStatus;
-
-    @ApiModelProperty(value = "收款人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "收款时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "明细")
-    private WebsitPartsSalesItem item;
-
-    @ApiModelProperty(value = "明细")
-    private WebsitSalesPayOrder payOrder;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsCreditItemVO.java

@@ -1,113 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPartsCreditItemVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    @ApiModelProperty(value = "销售单号")
-    private String salesId;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("销售类型")
-    private BuyPeopleEnum buyPeople;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("申请类别")
-    private PartsApplyCategoryEnum applyCategory;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty("师傅编号")
-    private String workerId;
-
-    @ApiModelProperty("申请人")
-    private String workerName;
-
-    @ApiModelProperty("联系电话")
-    private String mobile;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("申请类型")
-    private PartsApplyTypeEnum applyType;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("发货方式")
-    private DeliveryTypeEnum deliveryType;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("接收单位")
-    private String receiveUnit;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("发货单位")
-    private String deliveryUnit;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("详细地址")
-    private String addr;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("订单来源")
-    private SourceSalesEnum orderSource;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("订单状态")
-    private PartsOrderStatusEnum status;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("支付状态")
-    private PartsPayFlagEnum payFlag;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("配件名称")
-    private String partsName;
-
-    @ApiModelProperty("销售价")
-    private BigDecimal salesPrice;
-
-    @ApiModelProperty("优惠价")
-    private BigDecimal secondPrice;
-
-    @ApiModelProperty("数量")
-    private Integer qty;
-
-    @ApiModelProperty("应收金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty("收款状态")
-    private PartsCreditEnum creditStatus;
-
-    @ApiModelProperty("更新人")
-    private String updateBy;
-
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsCreditVO.java

@@ -1,47 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPartsCreditVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "师傅编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅姓名")
-    private String workerName;
-
-    @ApiModelProperty(value = "师傅身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "师傅联系电话")
-    private String mobile;
-
-    @ApiModelProperty(value = "记账总金额")
-    private BigDecimal total;
-
-    @ApiModelProperty(value = "已付款金额")
-    private BigDecimal recTotal;
-
-    @ApiModelProperty(value = "未付款金额")
-    private BigDecimal creditTotal;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsNewInRecordDTO.java

@@ -1,16 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.WebsitPartsNewInRecord;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class WebsitPartsNewInRecordDTO extends WebsitPartsNewInRecord {
-    @ApiModelProperty("网点")
-    AdminWebsit adminWebsit;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsNewInVO.java

@@ -1,127 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.PartsCheckStatusEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPartsNewInVO {
-    @ZfireField(hide = true)
-    @ApiModelProperty("id")
-    private String id;
-
-    @ApiModelProperty("凭证号")
-    private String voucherNo;
-
-    @ApiModelProperty("申请单号")
-    private String applyNo;
-
-    @ApiModelProperty("开单备注")
-    private String remark;
-
-    @ApiModelProperty("事物类型")
-    private String objectType;
-
-    @ApiModelProperty("配件编码")
-    private String partsNumber;
-
-    @ApiModelProperty("配件名称")
-    private String partsName;
-
-    @ApiModelProperty("物料组名称")
-    private String materialGroupName;
-
-    @ApiModelProperty("单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty("单价")
-    private BigDecimal price;
-
-    @ApiModelProperty("数量")
-    private BigDecimal qty;
-
-    @ApiModelProperty("新件编码(退旧件)")
-    private String newNo;
-
-    @ApiModelProperty("原价价格")
-    private BigDecimal primaryPrice;
-
-    @ApiModelProperty("折扣价格")
-    private BigDecimal discPrice;
-
-    @ApiModelProperty("优惠价格(实收)")
-    private BigDecimal realPrice;
-
-    @ApiModelProperty("新旧差价")
-    private BigDecimal diffPrice;
-
-    @ApiModelProperty("发出单位")
-    private String sendUnit;
-
-    @ApiModelProperty("领入单位")
-    private String receiveUnit;
-
-    @ApiModelProperty("发出网点编号")
-    private String sendWebsitId;
-
-    @ApiModelProperty("发出网点名称")
-    private String sendWebsitName;
-
-    @ApiModelProperty("发出配件网点编号")
-    private String sendPartsWebsitId;
-
-    @ApiModelProperty("领入网点编号")
-    private String receiveWebsitId;
-
-    @ApiModelProperty("领入网点名称")
-    private String receiveWebsitName;
-
-    @ApiModelProperty("领入配件网点编号")
-    private String receivePartsWebsitId;
-
-    @ApiModelProperty("开单日期")
-    private Date orderDate;
-
-    @ApiModelProperty("系统序号")
-    private String sysNo;
-
-    @ApiModelProperty("验收日期")
-    private Date receiveDate;
-
-    @ApiModelProperty("开单人")
-    private String operateBy;
-
-    @ApiModelProperty("发出单位区域")
-    private String sendUnitArea;
-
-    @ApiModelProperty("领入单位区域")
-    private String receiveUnitArea;
-
-    @ApiModelProperty("维修自编号")
-    private String repairCustomNo;
-
-    @ApiModelProperty("导入日期")
-    private Date importDate;
-
-    @ApiModelProperty("验收状态")
-    private PartsCheckStatusEnum status;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("验收人")
-    private String checkBy;
-
-    @ApiModelProperty("验收时间")
-    private Date checkTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsOldOutRecordDTO.java

@@ -1,16 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.plus.entity.AdminWebsit;
-import com.gree.mall.manager.plus.entity.WebsitPartsOldOutRecord;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class WebsitPartsOldOutRecordDTO extends WebsitPartsOldOutRecord {
-    @ApiModelProperty("网点")
-    AdminWebsit adminWebsit;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsOldOutVO.java

@@ -1,124 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPartsOldOutVO {
-
-    @ZfireField(hide = true)
-    @ApiModelProperty("id")
-    private String id;
-
-    @ApiModelProperty("凭证号")
-    private String voucherNo;
-
-    @ApiModelProperty("申请单号")
-    private String applyNo;
-
-    @ApiModelProperty("开单备注")
-    private String remark;
-
-    @ApiModelProperty("事物类型")
-    private String objectType;
-
-    @ApiModelProperty("配件编码")
-    private String partsNumber;
-
-    @ApiModelProperty("配件名称")
-    private String partsName;
-
-    @ApiModelProperty("物料组名称")
-    private String materialGroupName;
-
-    @ApiModelProperty("单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty("单价")
-    private BigDecimal price;
-
-    @ApiModelProperty("数量")
-    private BigDecimal qty;
-
-    @ApiModelProperty("新件编码(退旧件)")
-    private String newNo;
-
-    @ApiModelProperty("原价价格")
-    private BigDecimal primaryPrice;
-
-    @ApiModelProperty("折扣价格")
-    private BigDecimal discPrice;
-
-    @ApiModelProperty("优惠价格(实收)")
-    private BigDecimal realPrice;
-
-    @ApiModelProperty("新旧差价")
-    private BigDecimal diffPrice;
-
-    @ApiModelProperty("发出单位")
-    private String sendUnit;
-
-    @ApiModelProperty("领入单位")
-    private String receiveUnit;
-
-    @ApiModelProperty("发出网点编号")
-    private String sendWebsitId;
-
-    @ApiModelProperty("发出网点名称")
-    private String sendWebsitName;
-
-    @ApiModelProperty("发出配件网点编号")
-    private String sendPartsWebsitId;
-
-    @ApiModelProperty("领入网点编号")
-    private String receiveWebsitId;
-
-    @ApiModelProperty("领入网点名称")
-    private String receiveWebsitName;
-
-    @ApiModelProperty("领入配件网点编号")
-    private String receivePartsWebsitId;
-
-    @ApiModelProperty("开单日期")
-    private Date orderDate;
-
-    @ApiModelProperty("系统序号")
-    private String sysNo;
-
-    @ApiModelProperty("验收日期")
-    private Date receiveDate;
-
-    @ApiModelProperty("开单人")
-    private String operateBy;
-
-    @ApiModelProperty("发出单位区域")
-    private String sendUnitArea;
-
-    @ApiModelProperty("领入单位区域")
-    private String receiveUnitArea;
-
-    @ApiModelProperty("维修自编号")
-    private String repairCustomNo;
-
-    @ApiModelProperty("导入日期")
-    private Date importDate;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("修改人")
-    private String updateBy;
-
-    @ApiModelProperty("修改时间")
-    private Date updateTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsRefundRecordVO.java

@@ -1,82 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsEnum;
-import com.gree.mall.manager.enums.material.PartsRefundStateEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPartsRefundRecordVO {
-
-    @ApiModelProperty(value = "退款单号")
-    private String refundNo;
-
-    @ApiModelProperty(value = "记录号")
-    private String recordId;
-
-//    @ZfireField(hide = true)
-//    @ApiModelProperty(value = "商户编号")
-//    private String companyWechatId;
-//
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty(value = "网点编码")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "配件网点编号")
-    private String partsWebsitId;
-
-    @ApiModelProperty(value = "师傅身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "师傅编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称")
-    private String workerName;
-
-    @ApiModelProperty(value = "销售单号")
-    private String salesId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "销售单明细")
-    private String salesItemId;
-
-    @ApiModelProperty(value = "发生单号")
-    private String ref;
-
-    @ApiModelProperty(value = "单据类型")
-    private String refType;
-
-    @ApiModelProperty(value = "配件编码")
-    private String partsNumber;
-
-    @ApiModelProperty(value = "配件名称")
-    private String partsName;
-
-    @ApiModelProperty(value = "退款金额")
-    private BigDecimal refundAmount;
-
-    @ApiModelProperty(value = "退款状态")
-    private PartsRefundStateEnum refundState;
-
-    @ApiModelProperty(value = "是否已执行")
-    private IsEnum isExec;
-
-    @ApiModelProperty(value = "信息")
-    private String info;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesBean.java

@@ -1,29 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.bean.material.worker.OldRefundManageRecordBean;
-import com.gree.mall.manager.plus.entity.WebsitPartsSales;
-import com.gree.mall.manager.plus.entity.WebsitSalesPayOrder;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class WebsitPartsSalesBean extends WebsitPartsSales {
-
-    @ApiModelProperty(value = "订单配件信息", required = true)
-    private List<WebsitPartsSalesItemBean> itemList;
-
-    @ApiModelProperty(value = "支付记录列表", required = true)
-    private List<WebsitSalesPayOrder> payList;
-
-    @ApiModelProperty(value = "支付记录列表", required = true)
-    private List<WebsitSalesPayOrder> allPayList;
-
-    @ApiModelProperty(value = "订单明细使用信息", required = true)
-    private List<OldRefundManageRecordBean> oldRefundManageRecordBeanList;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesItemBean.java

@@ -1,19 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.plus.entity.WebsitPartsSalesItem;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class WebsitPartsSalesItemBean extends WebsitPartsSalesItem {
-
-    @ApiModelProperty("可用库存")
-    private BigDecimal stockQty;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesVO.java

@@ -1,128 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPartsSalesVO {
-
-    @ApiModelProperty("销售单号")
-    private String id;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty("销售类型")
-    private BuyPeopleEnum buyPeople;
-
-    @ApiModelProperty("申请类别")
-    private PartsApplyCategoryEnum applyCategory;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty("网点名称")
-    private String websitName;
-
-    @ApiModelProperty("申请类型")
-    private PartsApplyTypeEnum applyType;
-
-    @ApiModelProperty("发货方式")
-    private DeliveryTypeEnum deliveryType;
-
-    @ApiModelProperty("联系电话")
-    private String mobile;
-
-    @ApiModelProperty("接收单位")
-    private String receiveUnit;
-
-    @ApiModelProperty("发货单位")
-    private String deliveryUnit;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty("省")
-    private String province;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty("市")
-    private String city;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty("区")
-    private String area;
-
-    @ZfireField(tbName = "a")
-    @ApiModelProperty("详细地址")
-    private String addr;
-
-    @ApiModelProperty("订单来源")
-    private SourceSalesEnum orderSource;
-
-    @ApiModelProperty("订单状态")
-    private PartsOrderStatusEnum status;
-
-    @ApiModelProperty("支付状态")
-    private PartsPayFlagEnum payFlag;
-
-    @ZfireField(hide = true, ignoreSelect = true)
-    @ApiModelProperty("网点提货标识0-可提货 1-不可提货")
-    private Integer deliveryConfirmFlag;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("错误原因")
-    private String err;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("配件编码")
-    private String partsNumber;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("配件名称")
-    private String partsName;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("销售价")
-    private BigDecimal salesPrice;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("数量")
-    private Integer qty;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("审核数量")
-    private Integer examineQty;
-
-    @ZfireField(tbName = "b")
-    @ApiModelProperty("退款方式")
-    private PayTypeEnum refundAmountMode;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "小程序/公众号")
-    private String source;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "仓储id")
-    private String storageId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "仓储名称")
-    private String storageName;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsSalesWVO.java

@@ -1,102 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPartsSalesWVO {
-
-    @ApiModelProperty("销售单号")
-    private String id;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ApiModelProperty("销售类型")
-    private BuyPeopleEnum buyPeople;
-
-    @ApiModelProperty("申请类别")
-    private PartsApplyCategoryEnum applyCategory;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty("网点名称")
-    private String websitName;
-
-    @ApiModelProperty("申请类型")
-    private PartsApplyTypeEnum applyType;
-
-    @ApiModelProperty("发货方式")
-    private DeliveryTypeEnum deliveryType;
-
-    @ApiModelProperty("联系电话")
-    private String mobile;
-
-    @ApiModelProperty("接收单位")
-    private String receiveUnit;
-
-    @ApiModelProperty("发货单位")
-    private String deliveryUnit;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty("省")
-    private String province;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty("市")
-    private String city;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty("区")
-    private String area;
-
-    @ZfireField(tbName = "a")
-    @ApiModelProperty("详细地址")
-    private String addr;
-
-    @ApiModelProperty("购买方式")
-    private SourceSalesEnum orderSource;
-
-    @ApiModelProperty("订单状态")
-    private PartsOrderStatusEnum status;
-
-    @ApiModelProperty("支付状态")
-    private PartsPayFlagEnum payFlag;
-
-    @ZfireField(hide = true, ignoreSelect = true)
-    @ApiModelProperty("网点提货标识0-可提货 1-不可提货")
-    private Integer deliveryConfirmFlag;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("错误原因")
-    private String err;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "小程序/公众号")
-    private String source;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "仓储id")
-    private String storageId;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "仓储名称")
-    private String storageName;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPriceUpdBean.java

@@ -1,64 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel
-public class WebsitPriceUpdBean {
-
-    @ApiModelProperty(value = "单号")
-    private String sheetId;
-
-    @ZfireField(isQuery = false)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatName;
-
-    @NotBlank(message = "网点编号不能为空")
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @NotBlank(message = "网点名称不能为空")
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "审核人")
-    private String confirmBy;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date confirmTime;
-
-    @ApiModelProperty(value = "单据状态 SAVE=保存 OK=通过 FAIL=失败")
-    private String flag;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @Valid
-    @NotEmpty(message = "明细不能为空")
-    @ApiModelProperty(value = "明细")
-    private List<WebsitPriceUpdItemBean> items;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPriceUpdItemBean.java

@@ -1,62 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-@Data
-@ApiModel
-public class WebsitPriceUpdItemBean {
-
-    private String id;
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "单号")
-    private String sheetId;
-
-    @ApiModelProperty(value = "商品类型 M=辅材 P=配件")
-    private String goodsType;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @NotBlank(message = "商品编号不能为空")
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-    @NotBlank(message = "商品名称不能为空")
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @NotNull(message = "原售价不能为空")
-    @ApiModelProperty(value = "网点原售价")
-    private BigDecimal oldPrice;
-
-    @NotNull(message = "新售价不能为空")
-    @ApiModelProperty(value = "网点新售价")
-    private BigDecimal newPrice;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "商品父类编号")
-    private String parentCategoryId;
-
-    @ApiModelProperty(value = "商品父类名称")
-    private String parentCategoryName;
-
-    @ApiModelProperty(value = "商品小类编号")
-    private String goodsCategoryId;
-
-    @ApiModelProperty(value = "商品小类名称")
-    private String goodsCategoryName;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPriceUpdVO.java

@@ -1,68 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.MaterialFlagEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPriceUpdVO {
-
-    @ApiModelProperty(value = "单号")
-    private String sheetId;
-
-    @ZfireField(isQuery = false)
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-//    @ZfireField(tbName = "b")
-//    @ApiModelProperty(value = "商品编号")
-//    private String goodsId;
-//
-//    @ZfireField(tbName = "b")
-//    @ApiModelProperty(value = "商品名称")
-//    private String goodsName;
-//
-//    @ZfireField(tbName = "b")
-//    @ApiModelProperty(value = "网点原售价")
-//    private BigDecimal oldPrice;
-//
-//    @ZfireField(tbName = "b")
-//    @ApiModelProperty(value = "网点新售价")
-//    private BigDecimal newPrice;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "审核人")
-    private String confirmBy;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date confirmTime;
-
-    @ApiModelProperty(value = "单据状态")
-    private MaterialFlagEnum flag;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseAdjustmentBean.java

@@ -1,19 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.plus.entity.WebsitPurchaseAdjustment;
-import com.gree.mall.manager.plus.entity.WebsitPurchaseAdjustmentItem;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class WebsitPurchaseAdjustmentBean extends WebsitPurchaseAdjustment {
-
-    @ApiModelProperty(value = "明细")
-    private List<WebsitPurchaseAdjustmentItem> items;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseAdjustmentVO.java

@@ -1,64 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.MaterialFlagEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPurchaseAdjustmentVO {
-
-    @ApiModelProperty(value = "单号")
-    private String purchaseAdjustmentId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "采购单号")
-    private String ref;
-
-    @ApiModelProperty(value = "仓储名称")
-    private String storageName;
-
-    @ApiModelProperty(value = "单据状态")
-    private MaterialFlagEnum flag;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "提交人")
-    private String submitBy;
-
-    @ApiModelProperty(value = "提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty(value = "审核人")
-    private String confirmBy;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date confirmTime;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseApplyVO.java

@@ -1,67 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.material.MaterialFlagEnum;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@ApiModel
-@ZfireField(tbName = "a")
-public class WebsitPurchaseApplyVO {
-
-    @ApiModelProperty(value = "单号")
-    private String purchaseId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商品类型")
-    private WebsitGoodsTypeEnum goodsType;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "供应商编号")
-    private String venderId;
-
-    @ApiModelProperty(value = "供应商名称")
-    private String venderName;
-
-    @ApiModelProperty(value = "采购总金额")
-    private String totalAmount;
-
-//    @ZfireField(hide = true)
-    @ApiModelProperty(value = "单据状态")
-    private MaterialFlagEnum flag;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "是否核实")
-    private String isRecheck;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseBean.java

@@ -1,95 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel
-public class WebsitPurchaseBean {
-
-    @ApiModelProperty(value = "单号")
-    private String purchaseId;
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
-
-    @NotBlank(message = "网点编号不能为空")
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @NotBlank(message = "网点名称不能为空")
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @NotBlank(message = "商品类型不能为空")
-    @ApiModelProperty(value = "商品类型")
-    private String goodsType;
-
-    @ApiModelProperty(value = "供应商编号")
-    private String venderId;
-
-    @NotBlank(message = "供应商名称不能为空")
-    @ApiModelProperty(value = "供应商名称")
-    private String venderName;
-
-    @ApiModelProperty(value = "仓储id")
-    private String storageId;
-
-    @ApiModelProperty(value = "仓储名称")
-    private String storageName;
-
-    @ApiModelProperty(value = "采购日期")
-    private Date purchaseTime;
-
-//    @ApiModelProperty(value = "附件地址")
-//    private String fileUrl;
-
-    @ApiModelProperty(value = "附件地址")
-    private String imageUrl;
-
-    @ApiModelProperty(value = "采购总金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "单据状态 SAVE=保存 OK=通过 FAIL=失败")
-    private String flag;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "审核人")
-    private String confirmBy;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date confirmTime;
-
-    @ApiModelProperty(value = "是否导入数据 true=是 false=否")
-    private Boolean isImport;
-
-    @Valid
-    @NotEmpty(message = "明细不能为空")
-    @ApiModelProperty(value = "明细")
-    List<WebsitPurchaseItemBean> items;
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseItemBean.java

@@ -1,91 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-
-@Data
-@ApiModel
-public class WebsitPurchaseItemBean {
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "单号")
-    private String purchaseId;
-
-    @ApiModelProperty(value = "商品类型 M=辅材 P=配件")
-    private String goodsType;
-
-    @NotBlank(message = "商品编号不能为空")
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-    @NotBlank(message = "商品名称不能为空")
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @NotNull(message = "进价不能为空")
-    @ApiModelProperty(value = "进价")
-    private BigDecimal cost;
-
-    @ApiModelProperty(value = "验收金额")
-    private BigDecimal costValue;
-
-    @NotNull(message = "验收数量不能为空")
-    @Min(value = 1, message = "验收数量不能少于1")
-    @ApiModelProperty(value = "验收数量")
-    private BigDecimal recQty;
-//
-//    @ApiModelProperty(value = "验收赠品数量")
-//    private BigDecimal recGiftQty;
-
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "库存单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty(value = "规格型号")
-    private String goodsSpecification;
-
-    @ApiModelProperty(value = "商品父类编号")
-    private String parentCategoryId;
-
-    @ApiModelProperty(value = "商品父类名称")
-    private String parentCategoryName;
-
-    @ApiModelProperty(value = "商品小类编号")
-    private String goodsCategoryId;
-
-    @ApiModelProperty(value = "商品小类名称")
-    private String goodsCategoryName;
-
-    @ApiModelProperty(value = "适用品牌")
-    private String brand;
-
-    @ApiModelProperty(value = "适用产品大类")
-    private String productCategory;
-
-    @ApiModelProperty(value = "退货数量")
-    private BigDecimal retQty;
-
-    @ApiModelProperty(value = "备注")
-    private String note;
-
-    @ApiModelProperty(value = "库存数量(单据未审核时显示)")
-    private BigDecimal stockQty;
-
-
-}

mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPurchaseOrderVO.java

@@ -1,83 +0,0 @@
-package com.gree.mall.manager.bean.material.manage;
-
-import com.gree.mall.manager.annotation.ZfireField;
-import com.gree.mall.manager.enums.IsYesNoEnum;
-import com.gree.mall.manager.enums.material.MaterialFlagEnum;
-import com.gree.mall.manager.enums.material.WebsitGoodsTypeEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-@ApiModel
-@Data
-@ZfireField(tbName = "a")
-public class WebsitPurchaseOrderVO {
-    @ApiModelProperty(value = "单号")
-    private String purchaseId;
-
-//    @ApiModelProperty(value = "商户名称")
-//    private String companyWechatName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "商品类型")
-    private WebsitGoodsTypeEnum goodsType;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "供应商编号")
-    private String venderId;
-
-    @ApiModelProperty(value = "供应商名称")
-    private String venderName;
-
-    @ApiModelProperty(value = "采购总金额")
-    private String totalAmount;
-
-    @ApiModelProperty(value = "单据状态")
-    private MaterialFlagEnum flag;
-
-    @ZfireField(hide = true)
-    @ApiModelProperty(value = "是否核实")
-    private IsYesNoEnum isRecheck;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "核实备注")
-    private String checkRemark;
-
-    @ApiModelProperty(value = "审核备注")
-    private String confirmRemark;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "核实人")
-    private String checkBy;
-
-    @ApiModelProperty(value = "核实时间")
-    private Date checkTime;
-
-    @ApiModelProperty(value = "审核人")
-    private String confirmBy;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date confirmTime;
-}