no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/activity/PromotionActivityBean.java

@@ -1,26 +0,0 @@
-package com.gree.mall.miniapp.bean.activity;
-
-import com.gree.mall.miniapp.plus.entity.PromotionActivity;
-import com.gree.mall.miniapp.plus.entity.PromotionActivityItem;
-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 String name;
-
-    @ApiModelProperty(value = "活动图片")
-    private String detailImgs;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/engin/RpProjectRepairBean.java

@@ -1,22 +0,0 @@
-package com.gree.mall.miniapp.bean.engin;
-
-import com.gree.mall.miniapp.plus.entity.RpProjectRepair;
-import com.gree.mall.miniapp.plus.entity.RpProjectRepairWebsit;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author ：lijh
- * @description：TODO
- * @date ：2024/1/15 18:47
- */
-@ApiModel
-@Data
-public class RpProjectRepairBean extends RpProjectRepair {
-
-    @ApiModelProperty("服务网点")
-    private List<RpProjectRepairWebsit> projectRepairWebsitList;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/es/ESGoodsBean.java

@@ -1,110 +0,0 @@
-package com.gree.mall.miniapp.bean.es;
-
-import com.gree.mall.miniapp.plus.entity.EsGoodsImg;
-import com.gree.mall.miniapp.plus.entity.EsOrderInfo;
-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 ESGoodsBean {
-
-    @ApiModelProperty(value = "商品id")
-    private String id;
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-
-    @ApiModelProperty(value = "用户昵称")
-    private String userNickName;
-
-    @ApiModelProperty(value = "用户头像")
-    private String userHeadImg;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品描述")
-    private String goodsNote;
-
-    @ApiModelProperty(value = "商品分类id")
-    private String categoryId;
-
-    @ApiModelProperty(value = "商品分类名称")
-    private String categoryName;
-
-    @ApiModelProperty(value = "商品价格（含运费）")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "上架数量")
-    private Integer qty;
-
-    @ApiModelProperty(value = "商品品牌")
-    private String brand;
-
-    @ApiModelProperty(value = "功率（W）")
-    private String power;
-
-    @ApiModelProperty(value = "能效标识id")
-    private String markId;
-
-    @ApiModelProperty(value = "能效标识")
-    private String mark;
-
-    @ApiModelProperty(value = "制造日期")
-    private String makeDate;
-
-    @ApiModelProperty(value = "联系电话")
-    private String linkPhone;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-
-    @ApiModelProperty(value = "修改时间")
-    private Date updateTime;
-
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-
-    @ApiModelProperty(value = "状态 ON=上架 OFF=下架 SALE=已卖出")
-    private String status;
-
-    @ApiModelProperty(value = "点赞数量")
-    private Integer likeCount;
-
-    @ApiModelProperty(value = "访问数量")
-    private Integer queryCount;
-
-    @ApiModelProperty(value = "留言数量")
-    private Integer messageCount;
-
-    @ApiModelProperty(value = "商品图片")
-    private List<EsGoodsImg> imgList;
-//
-//    @ApiModelProperty(value = "留言")
-//    private List<EsGoodsMessage> messageList;
-
-    @ApiModelProperty(value = "是否点赞 true=是 false=否")
-    private Boolean isPraise;
-
-    @ApiModelProperty(value = "留言回复")
-    private List<EsGoodsMessageBean> messageAndReplyList;
-
-
-    @ApiModelProperty(value = "订单")
-    private EsOrderInfo esOrderInfo;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/es/ESGoodsOtherCountBean.java

@@ -1,20 +0,0 @@
-package com.gree.mall.miniapp.bean.es;
-
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel
-@Data
-public class ESGoodsOtherCountBean {
-
-    @ApiModelProperty(value = "点赞")
-    private int praiseCount;
-
-    @ApiModelProperty(value = "留言")
-    private int messageCount;
-
-    @ApiModelProperty(value = "查看")
-    private int queryCount;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/es/EsGoodsMessageBean.java

@@ -1,17 +0,0 @@
-package com.gree.mall.miniapp.bean.es;
-
-import com.gree.mall.miniapp.plus.entity.EsGoodsMessage;
-import com.gree.mall.miniapp.plus.entity.EsGoodsMessageReply;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class EsGoodsMessageBean extends EsGoodsMessage {
-
-    @ApiModelProperty(value = "回复")
-    private List<EsGoodsMessageReply> messageReplyList;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/es/EsOrderBuyBean.java

@@ -1,30 +0,0 @@
-package com.gree.mall.miniapp.bean.es;
-
-import com.gree.mall.miniapp.bean.order.BuyGood;
-import com.gree.mall.miniapp.bean.order.OrderOldProductAdd;
-import com.gree.mall.miniapp.enums.PayTypeEnum;
-import com.gree.mall.miniapp.plus.entity.EsOrderInfo;
-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 EsOrderBuyBean   {
-
-    @ApiModelProperty("二手商品id")
-    private String esGoodsId;
-
-    @ApiModelProperty("数量")
-    private Integer num;
-
-    @ApiModelProperty("收货地址id")
-    private String userAddressId;
-
-    @ApiModelProperty(value = "支付方式 WECHAT=微信支付 CASH=现金支付 TRANSFER=转账支付")
-    private String payType;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/es/EsOrderInfoBean.java

@@ -1,21 +0,0 @@
-package com.gree.mall.miniapp.bean.es;
-
-import com.gree.mall.miniapp.plus.entity.EsOrderInfo;
-import com.gree.mall.miniapp.plus.entity.EsOrderRefund;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class EsOrderInfoBean extends EsOrderInfo {
-
-    @ApiModelProperty(value = "客户售后信息")
-    private EsOrderRefundBean esOrderRefunds;
-
-
-    @ApiModelProperty(value = "线下售后信息")
-    private List<EsOrderRefundBean> esOrderRefundList;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/es/EsOrderRefundBean.java

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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/es/GuessBean.java

@@ -1,21 +0,0 @@
-package com.gree.mall.miniapp.bean.es;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class GuessBean {
-
-    @ApiModelProperty(value = "品牌")
-    private List<String> brandList;
-
-    @ApiModelProperty(value = "功率")
-    private List<String> powerList;
-
-    @ApiModelProperty(value = "能效")
-    private List<String> markList;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/goods/GoodsPackageBean.java

@@ -1,24 +0,0 @@
-package com.gree.mall.miniapp.bean.goods;
-
-import com.gree.mall.miniapp.plus.entity.GoodsPackagePop;
-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 GoodsPackageBean extends GoodsPackagePop {
-
-    @ApiModelProperty("商品名称")
-    private String goodsName;
-    @ApiModelProperty("图片")
-    private String imgUrl;
-    @ApiModelProperty("规格")
-    private String specValue;
-    @ApiModelProperty("划线价格")
-    private BigDecimal orgPrice;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/NormRecordVO.java

@@ -1,67 +0,0 @@
-package com.gree.mall.miniapp.bean.material;
-
-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 NormRecordVO {
-
-    @ApiModelProperty(value = "ID")
-    private String id;
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "商品类型 M=辅材 P=配件")
-    private String goodsType;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "师傅编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称")
-    private String workerName;
-
-    @ApiModelProperty(value = "工单编号")
-    private String orderId;
-
-    @ApiModelProperty(value = "关联工单")
-    private String refOrder;
-
-    @ApiModelProperty(value = "使用日期")
-    private Date useTime;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "使用数量")
-    private BigDecimal useQty;
-
-    @ApiModelProperty(value = "收费标准")
-    private BigDecimal normAmount;
-
-    @ApiModelProperty(value = "单位")
-    private String unit;
-
-    @ApiModelProperty(value = "客户电话")
-    private String phone;
-
-    @ApiModelProperty(value = "创建时间")
-    private Date createTime;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/PartsRefundVO.java

@@ -1,124 +0,0 @@
-package com.gree.mall.miniapp.bean.material;
-
-import com.gree.mall.miniapp.plus.entity.WebsitPartsRetItem;
-import com.gree.mall.miniapp.plus.entity.WebsitPartsRetOldRecord;
-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 PartsRefundVO {
-
-    @ApiModelProperty(value = "返件单号")
-    private String partsRetId;
-
-    @ApiModelProperty(value = "销售单号")
-    private String salesId;
-
-    @ApiModelProperty(value = "商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "网点编号")
-    private String websitId;
-
-    @ApiModelProperty(value = "网点名称")
-    private String websitName;
-
-    @ApiModelProperty(value = "类型  NEW 新件返还  OLD 旧件返还")
-    private String type;
-
-    @ApiModelProperty(value = "工程师编号")
-    private String workerId;
-
-    @ApiModelProperty(value = "工程师名称")
-    private String workerName;
-
-    @ApiModelProperty(value = "工程师手机号")
-    private String workerMobile;
-
-    @ApiModelProperty(value = "工程师网点编号")
-    private String workerWebsitId;
-
-    @ApiModelProperty(value = "工程师网点名称")
-    private String workerWebsitName;
-
-    @ApiModelProperty(value = "身份证")
-    private String identity;
-
-    @ApiModelProperty(value = "销售日期")
-    private Date salesTime;
-
-    @ApiModelProperty(value = "支付方式 CASH=现金 WECHAT=微信")
-    private String payType;
-
-    @ApiModelProperty(value = "支付时间")
-    private Date payTime;
-
-    @ApiModelProperty(value = "订单金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty(value = "支付订单号")
-    private String payNo;
-
-    @ApiModelProperty(value = "返件金额")
-    private BigDecimal totalRefundAmount;
-
-    @ApiModelProperty(value = "工单使用类型  INSIDE=保内 OUT=保外")
-    private String orderUseType;
-
-    @ApiModelProperty(value = "备注")
-    private String remark;
-
-    @ApiModelProperty(value = "状态 SAVE=保存 SUBMIT=提交 OK=通过 FAIL=失败")
-    private String 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 confirmBy;
-
-    @ApiModelProperty(value = "审核时间")
-    private Date confirmTime;
-
-    @ApiModelProperty(value = "退款时间")
-    private Date refundTime;
-
-    @ApiModelProperty(value = "退款状态 OK=成功 FAIL=失败 WAIT=等待")
-    private String refundState;
-
-    @ApiModelProperty(value = "退款流水号")
-    private String refundSerialNo;
-
-    @ApiModelProperty(value = "原因")
-    private String reason;
-
-    @ApiModelProperty(value = "明细")
-    private List<WebsitPartsRetItem> items;
-
-    @ApiModelProperty(value = "旧件记录")
-    private List<WebsitPartsRetOldRecord> records;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/SalesOrderBean.java

@@ -1,23 +0,0 @@
-package com.gree.mall.miniapp.bean.material;
-
-import com.gree.mall.miniapp.plus.entity.WebsitSales;
-import com.gree.mall.miniapp.plus.entity.WebsitSalesItem;
-import com.gree.mall.miniapp.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)
-@ApiModel
-@Data
-public class SalesOrderBean extends WebsitSales {
-
-    @ApiModelProperty(value = "支付订单")
-    WebsitSalesPayOrder websitSalesPayOrder;
-
-    @ApiModelProperty(value = "明细")
-    List<WebsitSalesItem> items;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/WebsitSalesCategoryVO.java

@@ -1,17 +0,0 @@
-package com.gree.mall.miniapp.bean.material;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel
-public class WebsitSalesCategoryVO {
-
-    @ApiModelProperty(value = "分类编号")
-    private String categoryId;
-
-    @ApiModelProperty(value = "分类名称")
-    private String categoryName;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/WebsitSalesGoodsVO.java

@@ -1,55 +0,0 @@
-package com.gree.mall.miniapp.bean.material;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class WebsitSalesGoodsVO {
-
-    @ApiModelProperty(value = "商品编号")
-    private String goodsId;
-
-    @ApiModelProperty(value = "商品名称")
-    private String goodsName;
-
-    @ApiModelProperty(value = "商品单价")
-    private BigDecimal price;
-
-    @ApiModelProperty(value = "商品代码")
-    private String goodsCode;
-
-    @ApiModelProperty(value = "商品简称")
-    private String goodsSpell;
-
-    @ApiModelProperty(value = "商品规格")
-    private String goodsSpecification;
-
-    @ApiModelProperty(value = "商品库存单位（网点采购时、网点销售时）")
-    private String goodsStockUnit;
-
-    @ApiModelProperty(value = "商品销售单位（师傅采购时、师傅销售时）")
-    private String goodsSalesUnit;
-
-    @ApiModelProperty(value = "品牌名称")
-    private String brandRelaName;
-
-    @ApiModelProperty(value = "产品名称")
-    private String productRelaName;
-
-    @ApiModelProperty(value = "库存数量")
-    private BigDecimal qty;
-
-    @ApiModelProperty(value = "转换数保留小数位（以0舍1入方式保留）")
-    private BigDecimal convertBitScale;
-
-    @ApiModelProperty(value = "销售单位转换系数")
-    private BigDecimal goodsSalesConvertQty;
-
-    @ApiModelProperty(value = "是否入师傅库存 NO=否 YES=是")
-    private String manageWorkerStock;
-
-    @ApiModelProperty(value = "配件类型")
-    private String partType;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/WebsitSalesPayMapBean.java

@@ -1,26 +0,0 @@
-package com.gree.mall.miniapp.bean.material;
-
-import com.gree.mall.miniapp.plus.entity.WebsitSalesPayMap;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class WebsitSalesPayMapBean extends WebsitSalesPayMap {
-
-    @ApiModelProperty(value = "短链接")
-    private String code;
-
-    @ApiModelProperty(value = "appid")
-    private String appid;
-
-    @ApiModelProperty(value = "appOrderId")
-    private String appOrderId;
-
-    @ApiModelProperty(value = "请求位置 1=小程序")
-    private Integer type;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/NewRefundManageBean.java

@@ -1,144 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.gree.mall.miniapp.bean.inf.ValidGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.*;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel
-@Accessors(chain = true)
-@JsonIgnoreProperties(value = {"createBy", "createTime", "updateBy", "updateTime", "submitBy"
-        , "submitTime", "examineBy", "examineTime", "refundedBy", "refundedTime"}, allowGetters = true)
-public class NewRefundManageBean {
-
-    private String companyWechatId;
-    private String companyWechatName;
-
-    @ApiModelProperty("申请单号")
-    @Null(groups = ValidGroup.Add.class, message = "申请单号必须为空")
-    @NotNull(groups = ValidGroup.Edit.class, message = "申请单号不能为空")
-    private String applyNo;
-
-    @ApiModelProperty("销售单号")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "销售单id不能空")
-    private String salesId;
-
-    @ApiModelProperty(value = "申请类别", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "申请类别不能空")
-    private String applyCategory;
-
-    @ApiModelProperty(value = "申请类别")
-    private String applyCategoryName;
-
-    @ApiModelProperty(value = "申请类型", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "申请类型不能空")
-    @Pattern(regexp = "^NEW|LOST|BUG$", message = "申请类型错误")
-    private String applyType;
-
-    @ApiModelProperty(value = "申请类型")
-    private String applyTypeName;
-
-    @ApiModelProperty(value = "返还方式", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "返还方式不能空")
-    private String refundMode;
-
-    @ApiModelProperty(value = "返还方式")
-    private String refundModeName;
-
-    @ApiModelProperty("快递单号")
-    private String expressNo;
-
-    @ApiModelProperty("收货地址")
-    private String receiveAddress;
-
-    @ApiModelProperty(value = "接收网点编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "接收网点编号不能空")
-    private String receiveWebsitId;
-
-    @ApiModelProperty("接收网点名称")
-    private String receiveWebsitName;
-
-    @ApiModelProperty("接收配件网点编号")
-    private String receivePartsWebsitId;
-
-    @ApiModelProperty("网点地址")
-    private String websitAddress;
-
-    @ApiModelProperty(value = "师傅身份证", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅身份证不能空")
-    private String identity;
-
-    @ApiModelProperty(value = "师傅编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅编号不能空")
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅名称不能空")
-    private String workerName;
-
-    @ApiModelProperty("退款金额")
-    private BigDecimal refundAmount;
-
-    @ApiModelProperty("退款方式")
-    private String refundAmountMode;
-
-    @ApiModelProperty("退款方式")
-    private String refundAmountModeName;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("审批备注")
-    private String examineRemark;
-
-    @ApiModelProperty("单据状态")
-    private String flag;
-
-    @ApiModelProperty("单据状态")
-    private String flagName;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("更新人")
-    private String updateBy;
-
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty("提交人")
-    private String submitBy;
-
-    @ApiModelProperty("提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty("审核人")
-    private String examineBy;
-
-    @ApiModelProperty("审核时间")
-    private Date examineTime;
-
-    @ApiModelProperty("确认返还人")
-    private String refundedBy;
-
-    @ApiModelProperty("确认返还时间")
-    private Date refundedTime;
-
-    @ApiModelProperty("申请明细")
-    @NotEmpty(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "申请明细不能空")
-    private List<NewRefundManageItemBean> newRefundManageItemBeanList;
-
-    @ApiModelProperty("记录")
-    private List<NewRefundManageRecordBean> partsNewRefundManageRecordList;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/NewRefundManageItemBean.java

@@ -1,65 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.gree.mall.miniapp.bean.inf.ValidGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@JsonIgnoreProperties(value = {"id"}, allowGetters = true)
-public class NewRefundManageItemBean {
-
-    private static final long serialVersionUID = 1L;
-
-    @Null(groups = {ValidGroup.Add.class}, message = "id必须为空")
-    private String id;
-
-    @ApiModelProperty("申请单号")
-    private String applyNo;
-
-    @ApiModelProperty("销售单id")
-    private String salesId;
-
-    @ApiModelProperty("配件编码")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "配件编码不能空")
-    private String partsNumber;
-
-    @ApiModelProperty("配件名称")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "配件名称不能空")
-    private String partsName;
-
-    @ApiModelProperty("物料组名称")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "物料组名称不能空")
-    private String materialGroupName;
-
-    @ApiModelProperty("单位名称")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "单位名称不能空")
-    private String goodsStockUnit;
-
-    @ApiModelProperty("数量")
-    @NotNull(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "数量不能空")
-    private BigDecimal qty;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("图片地址")
-    private String image;
-
-    @ApiModelProperty("自编码")
-    private String customNo;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("库存数量")
-    private BigDecimal stockQty = new BigDecimal("0");
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/NewRefundManageRecordBean.java

@@ -1,16 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.gree.mall.miniapp.plus.entity.WebsitPartsNewRefundManageRecord;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class NewRefundManageRecordBean extends WebsitPartsNewRefundManageRecord {
-
-    @ApiModelProperty("新件返还明细id")
-    private String refundStateName;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/OldRefundManageBean.java

@@ -1,190 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.gree.mall.miniapp.bean.inf.ValidGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@Data
-@ApiModel
-@JsonIgnoreProperties(value = {"createBy", "createTime", "updateBy", "updateTime", "submitBy"
-        , "submitTime", "examineBy", "examineTime", "refundedBy", "refundedTime", "settlement"}, allowGetters = true)
-public class OldRefundManageBean {
-
-    @ApiModelProperty(value = "商户编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "商户编号不能空")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "商户名称不能空")
-    private String companyWechatName;
-
-    @ApiModelProperty("申请单号")
-    @Null(groups = ValidGroup.Add.class, message = "申请单号必须为空")
-    @NotNull(groups = ValidGroup.Edit.class, message = "申请单号不能为空")
-    private String applyNo;
-
-    @ApiModelProperty(value = "申请类别", required = true)
-    private String applyCategory;
-
-    @ApiModelProperty(value = "申请类别")
-    private String applyCategoryName;
-
-    @ApiModelProperty(value = "申请类型", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "申请类型不能空")
-    private String applyType;
-
-    @ApiModelProperty(value = "申请类型")
-    private String applyTypeName;
-
-    @ApiModelProperty(value = "返还方式", required = true)
-    private String refundMode;
-
-    @ApiModelProperty(value = "返还方式")
-    private String refundModeName;
-
-    @ApiModelProperty("快递单号")
-    private String expressNo;
-
-    @ApiModelProperty("维修标识")
-    private String repairFlag;
-
-    @ApiModelProperty("维修标识")
-    private String repairFlagName;
-
-    @ApiModelProperty("收货地址")
-    private String receiveAddress;
-
-    @ApiModelProperty(value = "接收网点编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "接收网点编号不能空")
-    private String receiveWebsitId;
-
-    @ApiModelProperty("接收网点名称")
-    private String receiveWebsitName;
-
-    @ApiModelProperty("接收配件网点编号")
-    private String receivePartsWebsitId;
-
-    @ApiModelProperty("网点地址")
-    private String websitAddress;
-
-    @ApiModelProperty(value = "师傅身份证", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅身份证不能空")
-    private String identity;
-
-    @ApiModelProperty(value = "师傅编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅编号不能空")
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅名称不能空")
-    private String workerName;
-
-    @ApiModelProperty("工单编号")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "工单编号不能空")
-    private String workOrderNo;
-
-    @ApiModelProperty("总部工单派工id")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "总部工单派工id不能空")
-    private String pgId;
-
-    @ApiModelProperty(value = "用户名称")
-    private String customerName;
-
-    @ApiModelProperty(value = "用户电话")
-    private String customerTel;
-
-    @ApiModelProperty("退款金额")
-    private BigDecimal refundAmount;
-
-    @ApiModelProperty("退款方式")
-    private String refundAmountMode;
-
-    @ApiModelProperty("结算状态")
-    private Boolean settlementState;
-
-    @ApiModelProperty("结算状态")
-    private String settlementStateName;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("审批备注")
-    private String examineRemark;
-
-    @ApiModelProperty("复核备注")
-    private String reviewRemark;
-
-    @ApiModelProperty("是否优惠价 true=是 false=否")
-    private Boolean isDisc;
-
-    @ApiModelProperty("是否优惠价")
-    private String isDiscName;
-
-    @ApiModelProperty("是否执行优惠价 true=是 false=否")
-    private Boolean reviewResult;
-
-    @ApiModelProperty("是否执行优惠价")
-    private String reviewResultName;
-
-    @ApiModelProperty("单据状态")
-    private String flag;
-
-    @ApiModelProperty("单据状态")
-    private String flagName;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("更新人")
-    private String updateBy;
-
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty("提交人")
-    private String submitBy;
-
-    @ApiModelProperty("提交时间")
-    private Date submitTime;
-
-    @ApiModelProperty("审核人")
-    private String examineBy;
-
-    @ApiModelProperty("审核时间")
-    private Date examineTime;
-
-    @ApiModelProperty("确认返还人")
-    private String refundedBy;
-
-    @ApiModelProperty("确认返还时间")
-    private Date refundedTime;
-
-    @ApiModelProperty("复核人")
-    private String reviewBy;
-
-    @ApiModelProperty("复核时间")
-    private Date reviewTime;
-
-    @ApiModelProperty("导入更新时间")
-    private Date importTime;
-
-    @ApiModelProperty("申请明细")
-    @NotEmpty(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "申请明细不能空")
-    private List<OldRefundManageItemBean> oldRefundManageItemBeanList;
-
-    @ApiModelProperty("记录")
-    private List<OldRefundManageRecordBean> partsOldRefundManageRecordList;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/OldRefundManageItemBean.java

@@ -1,108 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.gree.mall.miniapp.bean.inf.ValidGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Null;
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-@ApiModel
-@JsonIgnoreProperties(value = {"id"}, allowGetters = true)
-public class OldRefundManageItemBean {
-
-    @Null(groups = {ValidGroup.Add.class}, message = "id必须为空")
-    private String id;
-
-    @ApiModelProperty("申请单号")
-    @TableField("applyNo")
-    private String applyNo;
-
-    @ApiModelProperty("旧配件编码")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "旧配件编码不能空")
-    private String oldPartsNumber;
-
-    @ApiModelProperty("旧配件名称")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "旧配件名称不能空")
-    private String oldPartsName;
-
-    @ApiModelProperty("旧配件物料组名称")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "旧配件物料组名称不能空")
-    private String oldMaterialGroupName;
-
-    @ApiModelProperty("旧配件单位名称")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "旧配件单位不能空")
-    private String oldGoodsStockUnit;
-
-    @ApiModelProperty("数量")
-    @NotNull(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "数量不能空")
-    private BigDecimal qty;
-
-    @ApiModelProperty("旧件图片地址")
-    private String oldImage;
-
-    @ApiModelProperty("铭牌")
-    private String tab;
-
-    @ApiModelProperty("新配件编码")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "新配件编码不能空")
-    private String newPartsNumber;
-
-    @ApiModelProperty("新配件名称")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "新配件名称不能空")
-    private String newPartsName;
-
-    @ApiModelProperty("新配件物料组名称")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "新配件物料组名称不能空")
-    private String newMaterialGroupName;
-
-    @ApiModelProperty("新配件单位")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "新配件单位不能空")
-    private String newGoodsStockUnit;
-
-    @ApiModelProperty("维修记录编号")
-    private String repairRecordNumber;
-
-    @ApiModelProperty("机器条形码")
-    private String machineBarcode;
-
-    @ApiModelProperty("修复时间")
-    private Date repairTime;
-
-    @ApiModelProperty("旧压缩机编号")
-    private String oldCompressNumber;
-
-    @ApiModelProperty("新压缩机编号")
-    private String newCompressNumber;
-
-    @ApiModelProperty("配件条码")
-    private String partsBarcode;
-
-    @ApiModelProperty("安装日期")
-    private Date installTime;
-
-    @ApiModelProperty("自编码")
-    private String customNo;
-
-    @ApiModelProperty("是否备用件 false=否 true=是")
-    private Boolean isBackup;
-
-    @ApiModelProperty("是否备用件")
-    private String isBackupName;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("收费明细id")
-    private String workerOrderItemId;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/OldRefundManageRecordBean.java

@@ -1,23 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.gree.mall.miniapp.plus.entity.WebsitPartsOldRefundManageRecord;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class OldRefundManageRecordBean extends WebsitPartsOldRefundManageRecord {
-
-    @ApiModelProperty("退款状态")
-    private String refundStateName;
-
-    @ApiModelProperty("维修标识 INNER=保内 OUTSIDE=保外")
-    private String repairFlagName;
-
-    @ApiModelProperty("是否备用件 false=否 true=是")
-    private String isBackupName;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/PartsChangeSalesBean.java

@@ -1,66 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.gree.mall.miniapp.plus.entity.WebsitPartsChangeSalesItem;
-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 PartsChangeSalesBean {
-
-    @ApiModelProperty("转销单号")
-    private String changeSalesNo;
-
-    @ApiModelProperty("销售单号")
-    private String salesId;
-
-    @ApiModelProperty("转单类型")
-    private String changeType;
-
-    @ApiModelProperty("总金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty("网点编码")
-    private String websitId;
-
-    @ApiModelProperty("网点名称")
-    private String websitName;
-
-    @ApiModelProperty("配件网点编号")
-    private String partsWebsitId;
-
-    @ApiModelProperty("师傅身份证")
-    private String identity;
-
-    @ApiModelProperty("师傅编号")
-    private String workerId;
-
-    @ApiModelProperty("师傅名称")
-    private String workerName;
-
-    @ApiModelProperty("审批备注")
-    private String examineRemark;
-
-    @ApiModelProperty("单据状态")
-    private String flag;
-
-    @ApiModelProperty("单据状态")
-    private String flagName;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("审核人")
-    private String examineBy;
-
-    @ApiModelProperty("审核时间")
-    private Date examineTime;
-
-    @ApiModelProperty("转销售明细")
-    List<WebsitPartsChangeSalesItem> partsChangeSalesItemList;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/PartsRefundRecordDTO.java

@@ -1,124 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import cn.hutool.core.date.DateUtil;
-import com.gree.mall.miniapp.enums.material.PartsRefTypeEnum;
-import com.gree.mall.miniapp.plus.entity.WebsitPartsSalesItem;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-@Data
-public class PartsRefundRecordDTO {
-
-    @ApiModelProperty("返还明细id")
-    private String itemId;
-
-    @ApiModelProperty("申请单号")
-    private String applyNo;
-
-    @ApiModelProperty("销售单id")
-    private String salesId;
-
-    @ApiModelProperty("销售单明细id")
-    private String salesItemId;
-
-    @ApiModelProperty("配件编码")
-    private String partsNumber;
-
-    @ApiModelProperty("配件名称")
-    private String partsName;
-
-    @ApiModelProperty("销售价")
-    private BigDecimal salesPrice;
-
-    @ApiModelProperty("市场价")
-    private BigDecimal marketPrice;
-
-    @ApiModelProperty("优惠价2")
-    private BigDecimal secondPrice;
-
-    @ApiModelProperty("数量")
-    private BigDecimal qty;
-
-    @ApiModelProperty("总金额")
-    private BigDecimal totalAmount;
-
-    @ApiModelProperty("退款方式 WX=微信 CASH=现金")
-    private String refundAmountMode;
-
-    @ApiModelProperty("退款金额")
-    private BigDecimal refundAmount;
-
-    @ApiModelProperty("维修标识 INNER=保内 OUTSIDE=保外")
-    private String repairFlag;
-
-    @ApiModelProperty("工单编号")
-    private String workOrderNo;
-
-    @ApiModelProperty("总部工单派工id")
-    private String pgId;
-
-    @ApiModelProperty("用户名称")
-    private String customerName;
-
-    @ApiModelProperty("用户电话")
-    private String customerTel;
-
-    @ApiModelProperty("是否备用件 false=否 true=是")
-    private Boolean isBackup;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-
-    public void injectData(SalesItemRecordDTO itemRecordDTO, WebsitPartsSalesItem salesOrderItem, BigDecimal qty, String refType) {
-        this.itemId = itemRecordDTO.getItemId();
-        this.applyNo = itemRecordDTO.getApplyNo();
-        this.salesId = salesOrderItem.getSalesId();
-        this.salesItemId = salesOrderItem.getId();
-        this.partsNumber = salesOrderItem.getPartsNumber();
-        this.partsName = salesOrderItem.getPartsName();
-        this.salesPrice = salesOrderItem.getSalesPrice();
-        this.marketPrice = salesOrderItem.getMarketPrice();
-        this.secondPrice = salesOrderItem.getSecondPrice();
-        this.qty = qty;
-        this.totalAmount = salesOrderItem.getSalesPrice().multiply(qty);
-        this.repairFlag = itemRecordDTO.getRepairFlag();
-        this.workOrderNo = itemRecordDTO.getWorkOrderNo();
-        this.pgId = itemRecordDTO.getPgId();
-        this.customerName = itemRecordDTO.getCustomerName();
-        this.customerTel = itemRecordDTO.getCustomerTel();
-        this.isBackup = itemRecordDTO.getIsBackup();
-        this.createTime = DateUtil.date();
-        this.refundAmountMode = salesOrderItem.getRefundAmountMode();
-        if (refType.equals(PartsRefTypeEnum.OLD_REFUND.getRemark()) || refType.equals(PartsRefTypeEnum.NEW_REFUND.getRemark())) {
-            // 旧件返还保内或新件返还 全额退还
-            this.refundAmount = salesOrderItem.getSalesPrice().multiply(qty);
-        } else if (refType.equals(PartsRefTypeEnum.OUTSIDE_TO_SALES.getRemark())) {
-            // 保外新件转销售的市场价-优惠价2的差价退还（旧计算方式）
-//            this.refundAmount = salesOrderItem.getMarketPrice().subtract(salesOrderItem.getSecondPrice()).multiply(qty);
-            // 销售价-优惠价2*1.2倍  返还差价
-            this.refundAmount = BigDecimal.ZERO;
-            if (salesOrderItem.getSecondPrice().compareTo(BigDecimal.ZERO) > 0) {
-                this.refundAmount = this.computeDiffAmount(salesOrderItem.getSalesPrice(), salesOrderItem.getSecondPrice(), qty);
-            }
-
-        }
-
-        if (refType.equals(PartsRefTypeEnum.NEW_REFUND.toString())) {
-            // 销售明细新件数量增加
-            salesOrderItem.setNewRefundQty(salesOrderItem.getNewRefundQty().add(qty));
-        } else {
-            // 销售明细旧件数量增加
-            salesOrderItem.setOldRefundQty(salesOrderItem.getOldRefundQty().add(qty));
-        }
-        // 销售明细数量减少
-        salesOrderItem.setQty(salesOrderItem.getQty().subtract(qty));
-    }
-
-    public BigDecimal computeDiffAmount(BigDecimal salesPrice, BigDecimal secondPrice, BigDecimal qty) {
-        return salesPrice.subtract(secondPrice.multiply(BigDecimal.valueOf(1.2))).multiply(qty);
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/PartsSalesOrderBean.java

@@ -1,41 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.gree.mall.miniapp.plus.entity.WebsitPartsSales;
-import com.gree.mall.miniapp.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 PartsSalesOrderBean extends WebsitPartsSales {
-
-    @ApiModelProperty("购买方式")
-    private String buyTypeName;
-
-    @ApiModelProperty("单据状态")
-    private String stateName;
-
-    @ApiModelProperty("下推标志")
-    private String pushFlagName;
-
-    @ApiModelProperty("提货状态名称")
-    private String pickupStateName;
-
-    @ApiModelProperty(value = "订单配件信息", required = true)
-    private List<PartsSalesOrderItemBean> itemList;
-
-    @ApiModelProperty(value = "支付记录列表", required = true)
-    private List<WebsitSalesPayOrder> payList;
-
-    @ApiModelProperty(value = "全部支付记录列表")
-    private List<WebsitSalesPayOrder> allPayList;
-
-    @ApiModelProperty(value = "订单明细使用信息", required = true)
-    private List<OldRefundManageRecordBean> oldRefundManageRecordBeanList;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/PartsSalesOrderItemBean.java

@@ -1,18 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.gree.mall.miniapp.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 PartsSalesOrderItemBean extends WebsitPartsSalesItem {
-
-	@ApiModelProperty("可用库存")
-    private BigDecimal stockQty;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/PartsWorkerStockBean.java

@@ -1,22 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.gree.mall.miniapp.plus.entity.WorkerStock;
-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 PartsWorkerStockBean extends WorkerStock {
-
-    @ApiModelProperty("市场价")
-    private BigDecimal marketPrice;
-
-    @ApiModelProperty("剩余天数")
-    private Long expireDay;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/SalesCustomerPartsBean.java

@@ -1,67 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.gree.mall.miniapp.bean.inf.ValidGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import java.util.List;
-
-@Data
-@ApiModel
-public class SalesCustomerPartsBean {
-
-    @ApiModelProperty(value = "商户编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "商户编号不能空")
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "商户名称不能空")
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "维修标识 INNER=保内 OUTSIDE=保外", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "维修标识不能空")
-    private String repairFlag;
-
-    @ApiModelProperty(value = "接收网点编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "接收网点编号不能空")
-    private String receiveWebsitId;
-
-    @ApiModelProperty("接收配件网点编号")
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "接收配件网点编号不能空")
-    private String receivePartsWebsitId;
-
-    @ApiModelProperty(value = "师傅身份证", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅身份证不能空")
-    private String identity;
-
-    @ApiModelProperty(value = "师傅编号", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅编号不能空")
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "师傅名称不能空")
-    private String workerName;
-
-    @ApiModelProperty(value = "工单编号", required = true)
-//    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "工单编号不能空")
-    private String workOrderNo;
-
-    @ApiModelProperty(value = "用户名称", required = true)
-//    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "用户名称不能空")
-    private String customerName;
-
-    @ApiModelProperty(value = "用户电话", required = true)
-//    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "用户电话不能空")
-    private String customerTel;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("明细")
-    @NotEmpty(groups = { ValidGroup.Add.class,ValidGroup.Edit.class }, message = "明细不能空")
-    private List<SalesCustomerPartsItemBean> items;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/SalesCustomerPartsItemBean.java

@@ -1,61 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.gree.mall.miniapp.bean.inf.ValidGroup;
-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 SalesCustomerPartsItemBean {
-
-    @ApiModelProperty(value = "新配件编码", required = true)
-    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "新配件编码不能空")
-    private String partsNumber;
-
-    @ApiModelProperty(value = "数量", required = true)
-    @NotNull(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "数量不能空")
-    private BigDecimal qty;
-
-    @ApiModelProperty("旧配件编号")
-    private String oldPartsNumber;
-
-    @ApiModelProperty("旧配件名称")
-    private String oldPartsName;
-
-    @ApiModelProperty("收费明细id")
-    private String workerOrderItemId;
-
-//    @ApiModelProperty(value = "维修记录编号")
-//    private String repairRecordNumber;
-//
-//    @ApiModelProperty(value = "机器条形码", required = true)
-//    @NotBlank(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "机器条形码不能空")
-//    private String machineBarcode;
-
-//    @ApiModelProperty(value = "修复时间", required = true)
-//    @NotNull(groups = {ValidGroup.Add.class, ValidGroup.Edit.class}, message = "修复时间不能空")
-//    private Date repairTime;
-
-//    @ApiModelProperty("旧压缩机编号")
-//    private String oldCompressNumber;
-//
-//    @ApiModelProperty("新压缩机编号")
-//    private String newCompressNumber;
-//
-//    @ApiModelProperty("配件条码")
-//    private String partsBarcode;
-//
-//    @ApiModelProperty("安装日期")
-//    private Date installTime;
-//
-//    @ApiModelProperty("自编码")
-//    private String customNo;
-
-//    @ApiModelProperty("备注")
-//    private String remark;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/SalesItemRecordDTO.java

@@ -1,48 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class SalesItemRecordDTO {
-
-    @ApiModelProperty("明细id")
-    private String itemId;
-
-    @ApiModelProperty("申请单号")
-    private String applyNo;
-
-    @ApiModelProperty("配件编码")
-    private String partsNumber;
-
-    @ApiModelProperty("配件名称")
-    private String partsName;
-
-    @ApiModelProperty("数量")
-    private BigDecimal qty;
-
-    @ApiModelProperty("销售单id")
-    private String salesId;
-
-    @ApiModelProperty("维修标识 INNER=保内 OUTSIDE=保外")
-    private String repairFlag;
-
-    @ApiModelProperty("工单编号")
-    private String workOrderNo;
-
-    @ApiModelProperty("总部工单派工id")
-    private String pgId;
-
-    @ApiModelProperty("用户名称")
-    private String customerName;
-
-    @ApiModelProperty("用户电话")
-    private String customerTel;
-
-    @ApiModelProperty("是否备用件 false=否 true=是")
-    private Boolean isBackup;
-
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/WebsitExtends.java

@@ -1,16 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import com.gree.mall.miniapp.plus.entity.AdminWebsit;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@EqualsAndHashCode(callSuper = true)
-@Data
-@ApiModel
-public class WebsitExtends extends AdminWebsit {
-
-    @ApiModelProperty("距离(单位:km)")
-    private Double distance;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/WebsitPartsStockBean.java

@@ -1,79 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-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 WebsitPartsStockBean {
-
-    @ApiModelProperty("id")
-    private String id;
-
-    @ApiModelProperty("商户编号")
-    private String companyWechatId;
-
-    @ApiModelProperty("商户名称")
-    private String companyWechatName;
-
-    @ApiModelProperty("网点编号")
-    private String websitId;
-
-    @ApiModelProperty("网点名称")
-    private String websitName;
-
-    @ApiModelProperty("配件网点编号")
-    private String partsWebsiteNumber;
-
-    @ApiModelProperty("配件编码")
-    private String partsNumber;
-
-    @ApiModelProperty("配件名称")
-    private String partsName;
-
-    @ApiModelProperty("物料组名称")
-    private String materialGroupName;
-
-    @ApiModelProperty("单位")
-    private String goodsStockUnit;
-
-    @ApiModelProperty("新件库存")
-    private BigDecimal qty;
-
-    @ApiModelProperty("旧件库存")
-    private BigDecimal oldQty;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    @ApiModelProperty("更新人")
-    private String updateBy;
-
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
-
-    @ApiModelProperty("市场价")
-    private BigDecimal marketPrice;
-
-    @ApiModelProperty("优惠价1")
-    private BigDecimal firstPrice;
-
-    @ApiModelProperty("优惠价2")
-    private BigDecimal secondPrice;
-
-    @ApiModelProperty("配件类型")
-    private String partType;
-
-    @ApiModelProperty("销售价")
-    private BigDecimal salesPrice;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/parts/WorkerStockCensusBean.java

@@ -1,38 +0,0 @@
-package com.gree.mall.miniapp.bean.material.parts;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-@ApiModel
-public class WorkerStockCensusBean {
-    @ApiModelProperty("师傅身份证")
-    private String identity;
-
-    @ApiModelProperty("师傅编号")
-    private String workerId;
-
-    @ApiModelProperty("师傅名称")
-    private String workerName;
-
-    @ApiModelProperty("新件库存")
-    private BigDecimal newQty;
-
-    @ApiModelProperty("旧件库存")
-    private BigDecimal oldQty;
-
-    @ApiModelProperty("新件待返还数量")
-    private BigDecimal newRefundQty;
-
-    @ApiModelProperty("新件待返还金额")
-    private BigDecimal newRefundAmount;
-
-    @ApiModelProperty("旧件待返还数量")
-    private BigDecimal oldRefundQty;
-
-    @ApiModelProperty("旧件待返还金额")
-    private BigDecimal oldRefundAmount;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/stock/WebsitStockDTO.java

@@ -1,161 +0,0 @@
-package com.gree.mall.miniapp.bean.material.stock;
-
-import com.gree.mall.miniapp.enums.material.DirectFlagEnum;
-import com.gree.mall.miniapp.enums.material.PartsAttrEnum;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.plus.entity.WebsitStock;
-import com.gree.mall.miniapp.plus.entity.WebsitStockAcc;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Objects;
-
-@Data
-@ApiModel
-public class WebsitStockDTO {
-
-    @ApiModelProperty("商户编号")
-    @NotBlank(message = "商户编号不能空")
-    private String companyWechatId;
-
-    @ApiModelProperty("商户名称")
-    @NotBlank(message = "商户名称不能空")
-    private String companyWechatName;
-
-    @ApiModelProperty("网点编号")
-    @NotBlank(message = "网点编号不能空")
-    private String websitId;
-
-    @ApiModelProperty("网点名称")
-    @NotBlank(message = "网点名称不能空")
-    private String websitName;
-
-    @ApiModelProperty("配件网点编号")
-    private String partsWebsitId;
-
-    @ApiModelProperty("发生时间")
-    @NotNull(message = "发生时间不能空")
-    private Date sdate;
-
-    @ApiModelProperty("商品类型")
-    @NotNull(message = "商品类型不能空")
-    private String goodsType;
-
-    @ApiModelProperty("配件属性 NEW=新件 OLD=旧件")
-    private String partsAttr;
-
-    @ApiModelProperty("商品编码")
-    @NotBlank(message = "商品编码不能空")
-    private String goodsId;
-
-    @ApiModelProperty("商品名称")
-    @NotBlank(message = "商品名称不能空")
-    private String goodsName;
-
-    @ApiModelProperty("发生单价")
-    private BigDecimal price;
-
-    @ApiModelProperty("相关单号")
-    @NotBlank(message = "相关单号不能空")
-    private String ref;
-
-    @ApiModelProperty("相关单据类型")
-    @NotBlank(message = "相关单据类型不能空")
-    private String refType;
-
-    @ApiModelProperty("变动数量")
-    @NotNull(message = "变动数量不能空")
-    private BigDecimal changeQty;
-
-    @ApiModelProperty("发生方向 ADD=增加 SUB=减少")
-    @NotBlank(message = "发生方向不能空")
-    private String directFlag;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("业务对象")
-    private String obj;
-
-    @ApiModelProperty("操作人")
-    @NotBlank(message = "操作人不能空")
-    private String operateBy;
-
-    @ApiModelProperty("操作时间")
-    @NotNull(message = "操作时间不能空")
-    private Date operateTime;
-
-    @ApiModelProperty(value = "仓储id")
-    @NotNull(message = "仓位不能空")
-    private String storageId;
-
-    @ApiModelProperty("采购订单号")
-    private String purchaseId;
-
-    @ApiModelProperty(value = "凭证号")
-    private String voucherNo;
-
-    @ApiModelProperty(value = "申请单号")
-    private String applyNo;
-
-    @ApiModelProperty(value = "物料组名称")
-    private String materialGroupName;
-
-    @ApiModelProperty(value = "单位")
-    private String goodsStockUnit;
-
-    public WebsitStock createPartsStock() {
-        WebsitStock websitStock = new WebsitStock();
-        BeanUtils.copyProperties(this, websitStock);
-        websitStock.setId(null)
-                .setLastCost(BigDecimal.ZERO)
-                .setGoodsType(this.getGoodsType())
-                .setQty(BigDecimal.ZERO)
-                .setOldQty(BigDecimal.ZERO)
-                .setCreateBy(this.operateBy)
-                .setCreateTime(this.operateTime);
-        return websitStock;
-    }
-
-    public void computeWebsitStock(WebsitStock websitStock, WebsitStockAcc websitStockAcc) {
-        BigDecimal qty = websitStock.getQty();
-        if (StringUtils.isNotBlank(this.partsAttr) && this.partsAttr.equals(PartsAttrEnum.OLD.getKey())) {
-            qty = websitStock.getOldQty();
-        }
-        if (Objects.isNull(this.directFlag)) {
-            throw new RemoteServiceException("发生方向不符");
-        }
-        BigDecimal direct = this.directFlag.equals(DirectFlagEnum.ADD.getKey()) ? BigDecimal.ONE : new BigDecimal("-1");
-        BigDecimal closeQty = qty.add(this.changeQty.multiply(direct));
-        if (closeQty.compareTo(BigDecimal.ZERO) < 0 && direct.compareTo(BigDecimal.ZERO) < 0 && !this.getRefType().equals("销售订单")) {
-            throw new RemoteServiceException("\""+ websitStock.getGoodsName() + "\"商品库存不允许为负");
-        }
-        // 注入三级帐
-        BeanUtils.copyProperties(this, websitStockAcc);
-        websitStockAcc.setWebsitId(this.websitId)
-                .setWebsitName(this.websitName)
-                .setPartsWebsitId(this.partsWebsitId)
-                .setQty(qty)
-                .setCloseQty(closeQty)
-                .setOperateBy(this.operateBy)
-                .setOperateTime(this.operateTime)
-                .setStorageId(this.storageId);
-        // 注入库存
-        if (this.partsAttr.equals(PartsAttrEnum.NEW.getKey())) {
-            websitStock.setQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.OLD.getKey())) {
-            websitStock.setOldQty(closeQty);
-        } else {
-            throw new RemoteServiceException("配件属性异常");
-        }
-        websitStock.setUpdateBy(this.operateBy)
-                .setUpdateTime(this.operateTime);
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/stock/WorkerNormStockBean.java

@@ -1,31 +0,0 @@
-package com.gree.mall.miniapp.bean.material.stock;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@ApiModel
-@Data
-public class WorkerNormStockBean {
-
-    @ApiModelProperty("收费标准编号")
-    private String normId;
-    @ApiModelProperty("师傅辅材编号")
-    private String workerGoodsId;
-    @ApiModelProperty("定义1比N扣减数量")
-    private BigDecimal qty;
-    @ApiModelProperty("师傅辅材名称")
-    private String goodsName;
-    @ApiModelProperty("师傅辅材名称")
-    private String salesUnit;
-    @ApiModelProperty("是否小件")
-    private Boolean isSmall;
-    @ApiModelProperty("库存数量")
-    private BigDecimal stockQty;
-    @ApiModelProperty("实际要扣减数量")
-    private BigDecimal realQty;
-    @ApiModelProperty("收费标准单价")
-    private BigDecimal normPrice;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/stock/WorkerStockAccBean.java

@@ -1,13 +0,0 @@
-package com.gree.mall.miniapp.bean.material.stock;
-
-import com.gree.mall.miniapp.plus.entity.WorkerStockAcc;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel
-@Data
-public class WorkerStockAccBean extends WorkerStockAcc {
-    @ApiModelProperty("单位")
-    private String unit;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/stock/WorkerStockBean.java

@@ -1,19 +0,0 @@
-package com.gree.mall.miniapp.bean.material.stock;
-
-import com.gree.mall.miniapp.plus.entity.WorkerStock;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel
-@Data
-public class WorkerStockBean extends WorkerStock {
-
-    @ApiModelProperty("商品规格")
-    private String goodsSpecification;
-    @ApiModelProperty("产品类别id")
-    private String goodsCategoryId;
-    @ApiModelProperty("产品类别名称")
-    private String categoryName;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/stock/WorkerStockDTO.java

@@ -1,195 +0,0 @@
-package com.gree.mall.miniapp.bean.material.stock;
-
-import com.gree.mall.miniapp.enums.material.PartsAttrEnum;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.plus.entity.WorkerStock;
-import com.gree.mall.miniapp.plus.entity.WorkerStockAcc;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.Objects;
-
-@Data
-public class WorkerStockDTO {
-
-    @ApiModelProperty("商户编号")
-    @NotBlank(message = "商户编号不能空")
-    private String companyWechatId;
-
-    @ApiModelProperty("商户名称")
-    @NotBlank(message = "商户名称不能空")
-    private String companyWechatName;
-
-    @ApiModelProperty("师傅身份证")
-    @NotBlank(message = "师傅身份证不能空")
-    private String identity;
-
-    @ApiModelProperty("师傅编号")
-    @NotBlank(message = "师傅编号不能空")
-    private String workerId;
-
-    @ApiModelProperty("师傅名称")
-    @NotBlank(message = "师傅名称不能空")
-    private String workerName;
-
-    @ApiModelProperty("师傅网点编号")
-//    @NotBlank(message = "师傅网点编号不能空")
-    private String workerWebsitId;
-
-    @ApiModelProperty("师傅网点名称")
-//    @NotBlank(message = "师傅网点名称不能空")
-    private String workerWebsitName;
-
-    @ApiModelProperty("销售网点编号")
-    @NotBlank(message = "销售网点编号不能空")
-    private String websitId;
-
-    @ApiModelProperty("销售网点名称")
-    @NotBlank(message = "销售网点名称不能空")
-    private String websitName;
-
-    @ApiModelProperty("配件网点编号")
-    private String partsWebsitId;
-
-    @ApiModelProperty("商品类型")
-    @NotNull(message = "商品类型不能空")
-    private String goodsType;
-
-    @ApiModelProperty("发生时间")
-    @NotNull(message = "发生时间不能空")
-    private Date sdate;
-
-    @ApiModelProperty("商品编码")
-    @NotBlank(message = "商品编码不能空")
-    private String goodsId;
-
-    @ApiModelProperty("商品名称")
-    @NotBlank(message = "商品名称不能空")
-    private String goodsName;
-
-    @ApiModelProperty("单位id")
-    private String goodsStockUnit;
-
-    @ApiModelProperty("物料组名称")
-    private String materialGroupName;
-
-    @ApiModelProperty("发生单价")
-    private BigDecimal price;
-
-    @ApiModelProperty("相关单号")
-    @NotBlank(message = "相关单号不能空")
-    private String ref;
-
-    @ApiModelProperty("相关单号")
-    @NotBlank(message = "相关单据类型不能空")
-    private String refType;
-
-    @ApiModelProperty("配件属性 NEW=新件 OLD=旧件")
-    @NotBlank(message = "配件属性不能空")
-    private String partsAttr;
-
-    @ApiModelProperty("变动数量")
-    @NotNull(message = "变动数量不能空")
-    private BigDecimal changeQty;
-
-    @ApiModelProperty("发生方向 ADD=增加 SUB=减少")
-    @NotBlank(message = "发生方向不能空")
-    private String directFlag;
-
-    @ApiModelProperty("备注")
-    private String remark;
-
-    @ApiModelProperty("业务对象")
-    private String obj;
-
-    @ApiModelProperty("状态 ING=在途 TAKE=已提货 USED=已使用 REFUND=退货 INIT=初始化 REFUND_NEW=返新件 REFUND_OLD=返旧件")
-    private String flag;
-
-    @ApiModelProperty("销售方式 OWM=自有 OUT=外购")
-    private String settlementType;
-
-    @ApiModelProperty("工单号")
-    private String workerOrderNo;
-
-    @ApiModelProperty("操作人")
-    @NotBlank(message = "操作人不能空")
-    private String operateBy;
-
-    @ApiModelProperty("操作时间")
-    @NotNull(message = "操作时间不能空")
-    private Date operateTime;
-
-    public WorkerStock createWorkerStock() {
-        WorkerStock workerStock = new WorkerStock();
-        BeanUtils.copyProperties(this, workerStock);
-        workerStock.setId(null)
-                .setWebsitId(StringUtils.isBlank(this.workerWebsitId) ? this.websitId : this.workerWebsitId)
-                .setWebsitName(StringUtils.isBlank(this.workerWebsitName) ? this.websitName : this.workerWebsitName)
-                .setQty(BigDecimal.ZERO)
-                .setOldQty(BigDecimal.ZERO)
-                .setTempNewQty(BigDecimal.ZERO)
-                .setTempOldQty(BigDecimal.ZERO)
-                .setWayQty(BigDecimal.ZERO)
-                .setChangeSalesQty(BigDecimal.ZERO)
-                .setCreateBy(this.operateBy)
-                .setCreateTime(this.operateTime)
-                .setUpdateBy(this.operateBy)
-                .setUpdateTime(this.operateTime);
-        return workerStock;
-    }
-
-    public void computeWorkerStock(WorkerStock workerStock, WorkerStockAcc workerStockAcc) throws RemoteServiceException {
-        BigDecimal qty;
-        if (this.partsAttr.equals(PartsAttrEnum.NEW.getKey())) {
-            qty = workerStock.getQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.OLD.getKey())) {
-            qty = workerStock.getOldQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.getKey())) {
-            qty = workerStock.getTempNewQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.getKey())) {
-            qty = workerStock.getTempOldQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.getKey())) {
-            qty = workerStock.getWayQty();
-        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.getKey())) {
-            qty = workerStock.getChangeSalesQty();
-        } else {
-            throw new RemoteServiceException("配件库存属性不匹配：" + this.partsAttr);
-        }
-        if (Objects.isNull(this.directFlag)) {
-            throw new RemoteServiceException("发生方向不符");
-        }
-        BigDecimal direct = this.directFlag.equals("ADD") ? BigDecimal.ONE : new BigDecimal("-1");
-        BigDecimal closeQty = qty.add(this.changeQty.multiply(direct));
-        if (closeQty.compareTo(BigDecimal.ZERO) < 0 && this.partsAttr.equals(PartsAttrEnum.NEW.getKey())) {
-            throw new RemoteServiceException(workerStock.getGoodsName() + "：" + this.partsAttr + "结存库存不能少于0");
-        }
-        // 注入三级帐
-        BeanUtils.copyProperties(this, workerStockAcc);
-        workerStockAcc.setQty(qty)
-                .setCloseQty(closeQty)
-                .setOperBy(this.operateBy)
-                .setOperTime(this.operateTime);
-        // 注入库存
-        if (this.partsAttr.equals(PartsAttrEnum.NEW.getKey())) {
-            workerStock.setQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.OLD.getKey())) {
-            workerStock.setOldQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_NEW.getKey())) {
-            workerStock.setTempNewQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.TEMP_OLD.getKey())) {
-            workerStock.setTempOldQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.WAY.getKey())) {
-            workerStock.setWayQty(closeQty);
-        } else if (this.partsAttr.equals(PartsAttrEnum.CHANGE_NEW.getKey())) {
-            workerStock.setChangeSalesQty(closeQty);
-        }
-        workerStock.setOperBy(this.operateBy)
-                .setOperTime(this.operateTime);
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/stock/WorkerStockDetailBean.java

@@ -1,13 +0,0 @@
-package com.gree.mall.miniapp.bean.material.stock;
-
-import com.gree.mall.miniapp.plus.entity.WorkerStock;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel
-@Data
-public class WorkerStockDetailBean extends WorkerStock {
-    @ApiModelProperty("单位")
-    private String unit;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/order/BuyGood.java

@@ -31,7 +31,7 @@ public class BuyGood {
     private String wxSceneId;
 
     @ApiModelProperty("是否为满件折扣商品，不需要前端传")
-    private Boolean promotionFullPiece;
+    private Boolean promotionFullPiece = false;
 
     @JsonIgnore
     private Goods goods;

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/order/MaterialOrderBuy.java

@@ -1,18 +0,0 @@
-package com.gree.mall.miniapp.bean.order;
-
-import com.gree.mall.miniapp.plus.entity.RpMaterialOrder;
-import com.gree.mall.miniapp.plus.entity.RpMaterialOrderItem;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class MaterialOrderBuy extends RpMaterialOrder {
-
-    @ApiModelProperty(value = "子订单信息")
-    private List<RpMaterialOrderItem> rpMaterialOrderItemList;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/order/OldProductManagerAdd.java

@@ -1,16 +0,0 @@
-package com.gree.mall.miniapp.bean.order;
-
-import com.gree.mall.miniapp.plus.entity.OldProductManager;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class OldProductManagerAdd extends OldProductManager {
-
-    @ApiModelProperty("回收信息明细")
-    private List<OrderOldProductAdd> orderOldProductAdds;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/order/WorkerOrderBuy.java

@@ -1,15 +0,0 @@
-package com.gree.mall.miniapp.bean.order;
-
-import com.gree.mall.miniapp.plus.entity.WorkerOrder;
-import com.gree.mall.miniapp.plus.entity.WorkerOrderItem;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class WorkerOrderBuy extends WorkerOrder {
-
-    @ApiModelProperty(value = "子订单信息")
-    private List<WorkerOrderItem> workerOrderItems;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/order/WorkerOrderDetail.java

@@ -1,16 +0,0 @@
-package com.gree.mall.miniapp.bean.order;
-
-import com.gree.mall.miniapp.plus.entity.WorkerOrder;
-import com.gree.mall.miniapp.plus.entity.WorkerOrderItem;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-
-@Data
-public class WorkerOrderDetail extends WorkerOrder {
-
-    @ApiModelProperty(value = "子订单信息")
-    private List<WorkerOrderItem> workerOrderItems;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/order/WorkerOrderVO.java

@@ -1,9 +0,0 @@
-package com.gree.mall.miniapp.bean.order;
-
-import com.gree.mall.miniapp.plus.entity.WorkerOrder;
-import lombok.Data;
-
-@Data
-public class WorkerOrderVO extends WorkerOrder {
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/promotion/PromotionQuestionnaireAddBean.java

@@ -1,31 +0,0 @@
-package com.gree.mall.miniapp.bean.promotion;
-
-import com.gree.mall.miniapp.plus.entity.PromotionQuestionnaire;
-import com.gree.mall.miniapp.plus.entity.PromotionQuestionnaireItem;
-import com.gree.mall.miniapp.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("状态0=未开始 1=进行中 2=已过期 3=已终止")
-    private Integer status;
-    @ApiModelProperty("剩余可提交次数")
-    private Integer limit;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/seckill/SecKillBean.java

@@ -1,13 +0,0 @@
-package com.gree.mall.miniapp.bean.seckill;
-
-import lombok.Data;
-
-@Data
-public class SecKillBean {
-
-    private String secKillId;
-    private String secKillSpecId;
-    private String goodsId;
-    private String userId;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/seckill/SecKillExtends.java

@@ -1,25 +0,0 @@
-package com.gree.mall.miniapp.bean.seckill;
-
-import com.gree.mall.miniapp.plus.entity.SecKillActivity;
-import com.gree.mall.miniapp.plus.entity.SecKillActivitySpec;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class SecKillExtends extends SecKillActivity {
-    @ApiModelProperty("yjs=已结束 jxz=进行中 wks=未开始")
-    private String type;
-    @ApiModelProperty("秒杀开始场次时间")
-    private Integer startHour;
-    @ApiModelProperty("秒杀结束场次时间")
-    private Integer endHour;
-    @ApiModelProperty("开始场次的完整时间")
-    private String startDatetime;
-    @ApiModelProperty("结束场次的完整时间")
-    private String endDatetime;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/seckill/SecKillList.java

@@ -1,13 +0,0 @@
-package com.gree.mall.miniapp.bean.seckill;
-
-import com.gree.mall.miniapp.plus.entity.SecKillActivitySpec;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel
-@Data
-public class SecKillList extends SecKillActivitySpec {
-    @ApiModelProperty("商品详情")
-    private String content;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/tag/TagBean.java

@@ -1,16 +0,0 @@
-package com.gree.mall.miniapp.bean.tag;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class TagBean {
-    @ApiModelProperty("企业微信标签列表")
-    private List<TagGroupBean> tagGroupBeanList;
-    @ApiModelProperty("自定义标签名列表")
-    private List<String> tagNameList;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/tag/TagGroupBean.java

@@ -1,21 +0,0 @@
-package com.gree.mall.miniapp.bean.tag;
-
-import com.gree.mall.miniapp.bean.tag.UserWxCustomerTagBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class TagGroupBean {
-    @ApiModelProperty("标签组id")
-    private String tagGroupId;
-    @ApiModelProperty("标签组名")
-    private String tagGroupName;
-
-    @ApiModelProperty("标签列表")
-    private List<UserWxCustomerTagBean> tags;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/tag/UserWxCustomerBean.java

@@ -1,29 +0,0 @@
-package com.gree.mall.miniapp.bean.tag;
-
-import com.gree.mall.miniapp.bean.tag.UserWxCustomerTagBean;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-@ApiModel
-@Data
-public class UserWxCustomerBean {
-    @ApiModelProperty("姓名")
-    private String nickName;
-    @ApiModelProperty("手机号码")
-    private String mobile;
-    @ApiModelProperty("union id")
-    private String unionId;
-    @ApiModelProperty("创建时间")
-    private Date serviceTime;
-    @ApiModelProperty("标签列表")
-    private List<UserWxCustomerTagBean> tags;
-    @ApiModelProperty("自定义标签列表")
-    private List<UserWxCustomerTagBean> customtags;
-    private String lastAccessTime;
-
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/tag/UserWxCustomerTagBean.java

@@ -1,16 +0,0 @@
-package com.gree.mall.miniapp.bean.tag;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@ApiModel
-@Data
-public class UserWxCustomerTagBean {
-    @ApiModelProperty("标签名")
-    private String tagName;
-    @ApiModelProperty("标签id")
-    private String tagId;
-    @ApiModelProperty("是否标记")
-    private Boolean tagged;
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/tag/WxCustomerTagBean.java

@@ -1,21 +0,0 @@
-package com.gree.mall.miniapp.bean.tag;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class WxCustomerTagBean {
-    @ApiModelProperty("用户unionId")
-    private String unionId;
-    @ApiModelProperty("该用户要增加的企业微信tag")
-    private List<SimpleTagBean> addTags;
-    @ApiModelProperty("该用户要删除的企业微信tagId")
-    private List<String> delTags;
-    @ApiModelProperty("要新建的自定义标签列表")
-    private List<String> saveTags;
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/user/UserApplyBean.java

@@ -1,12 +1,10 @@
 package com.gree.mall.miniapp.bean.user;
 
 import com.gree.mall.miniapp.enums.UserTypeEnum;
-import com.gree.mall.miniapp.plus.entity.WorkerImg;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
 
 /**
  * 分销员，师傅入驻
@@ -27,8 +25,6 @@ public class UserApplyBean {
     private String idCard;
     @ApiModelProperty(required = true, value = "身份证图片")
     private String idCardImg;
-    @ApiModelProperty("其他图片")
-    private List<WorkerImg> workerImgs;
 
     @ApiModelProperty("银行卡")
     private String bankAccount;

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/user/UserWxBean.java

@@ -1,12 +1,10 @@
 package com.gree.mall.miniapp.bean.user;
 
 import com.gree.mall.miniapp.plus.entity.User;
-import com.gree.mall.miniapp.plus.entity.WorkerImg;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.List;
 
 @ApiModel
 @Data
@@ -36,8 +34,6 @@ public class UserWxBean extends User {
     private Boolean moduleWb;
     @ApiModelProperty("二手商城模块")
     private Boolean moduleEs;
-    @ApiModelProperty("师傅图片")
-    private List<WorkerImg> workerImgs;
 
     @ApiModelProperty("是否可以到店支付")
     private Boolean storePay = false;

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/workorder/OrderFlagLogic.java

@@ -7,10 +7,8 @@ import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.logic.common.CommonLogic;
 import com.gree.mall.miniapp.plus.entity.PgOrderBase;
 import com.gree.mall.miniapp.plus.entity.PgOrderFlag;
-import com.gree.mall.miniapp.plus.entity.RpMaterialOrder;
 import com.gree.mall.miniapp.plus.service.PgOrderBaseService;
 import com.gree.mall.miniapp.plus.service.PgOrderFlagService;
-import com.gree.mall.miniapp.plus.service.RpMaterialOrderService;
 import com.gree.mall.miniapp.utils.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +35,6 @@ public class OrderFlagLogic {
     @Autowired
     CommonLogic commonLogic;
 
-    @Autowired
-    RpMaterialOrderService rpMaterialOrderService;
-
     /**
      * 保存服务单标识
      * @param orderBaseIds
@@ -47,27 +42,9 @@ public class OrderFlagLogic {
      */
     @Transactional
     public void saveOrderFlag(List<String> orderBaseIds, OrderFlagEnum orderFlagEnum){
-        if (orderFlagEnum.getKey().equals(OrderFlagEnum.YWG.getKey())){
-            this.ifWeiBao(orderBaseIds);
-        }
         this.saveOrderFlag(orderBaseIds,orderFlagEnum,"");
     }
 
-    private void ifWeiBao(List<String> orderBaseIds) {
-        List<PgOrderBase> list = pgOrderBaseService.lambdaQuery().in(PgOrderBase::getId, orderBaseIds).list();
-        for (PgOrderBase pgOrderBase : list) {
-            if (StringUtil.isEmpty(pgOrderBase.getRpProjectRepairId()))
-                continue;
-
-            if (rpMaterialOrderService.lambdaQuery().eq(RpMaterialOrder::getWorkerOrderId,pgOrderBase.getId())
-                    .in(RpMaterialOrder::getExamineStatus, MaterialExamineStatusEnum.FAIL.getKey(),MaterialExamineStatusEnum.WAIT.getKey()).count()
-                    > 0) {
-                throw new RemoteServiceException("尚有未走完流程的费用详情");
-            }
-
-        }
-    }
-
     @Transactional
     public void saveOrderFlag(List<String> orderBaseIds, OrderFlagEnum orderFlagEnum, String remark){
         if(CollectionUtils.isEmpty(orderBaseIds) || orderFlagEnum == null){

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/workorder/RpMaterialOrderVO.java

@@ -1,25 +0,0 @@
-package com.gree.mall.miniapp.bean.workorder;
-
-import com.gree.mall.miniapp.plus.entity.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@ApiModel
-public class RpMaterialOrderVO 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-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/AppMapper.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gree.mall.miniapp.bean.goods.GoodsNewBean;
 import com.gree.mall.miniapp.bean.order.OrderStatusBean;
 import com.gree.mall.miniapp.bean.order.ShoppingCartList;
-import com.gree.mall.miniapp.bean.seckill.SecKillExtends;
-import com.gree.mall.miniapp.bean.seckill.SecKillList;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,20 +31,6 @@ public interface AppMapper {
 
 
     /**
-     * 秒杀时间段
-     * @return
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public List<SecKillExtends> queryTimeList(@Param("companyWechatId") String companyWechatId);
-
-    /**
-     * 秒杀商品列表
-     * @return
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public List<SecKillList> querySecKillList(@Param("time") String time);
-
-    /**
      * 精选分类商品
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CommonMapper.java

@@ -3,9 +3,7 @@ package com.gree.mall.miniapp.commonmapper;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.bean.activity.PromotionActivityBean;
 import com.gree.mall.miniapp.bean.chargingstandard.ChargingStandardBean;
-import com.gree.mall.miniapp.bean.es.ESGoodsBean;
 import com.gree.mall.miniapp.bean.material.MyDataCountBean;
 import com.gree.mall.miniapp.bean.order.LeaseOrderVO;
 import com.gree.mall.miniapp.bean.user.SettleMonthWagesWorkerBean;
@@ -93,56 +91,5 @@ public interface CommonMapper {
      */
     MyDataCountBean partsApplyCount(@Param("userId") String userId);
 
-    /**
-     * 活动单列表
-     * @param page
-     * @param companyWechatId
-     * @param userId
-     * @param promotionQuestionnaireId
-     * @return
-     */
-    List<PromotionActivityBean> promotionActivity(IPage page,
-                                                  @Param("companyWechatId") String companyWechatId,
-                                                  @Param("userId") String userId,
-                                                  @Param("promotionQuestionnaireId") String promotionQuestionnaireId);
 
-    /**
-     * 二手商品列表
-     * @param page
-     * @param companyWechatId
-     * @param sortType
-     * @param goodsName
-     * @param categoryId
-     * @param userId
-     * @param brand
-     * @param power
-     * @param mark
-     * @param status
-     * @return
-     */
-    IPage<ESGoodsBean> esGoodsList(IPage page,
-                                   @Param("companyWechatId") String companyWechatId,
-                                   @Param("sortType") String sortType,
-                                   @Param("goodsName") String goodsName,
-                                   @Param("categoryId") String categoryId,
-                                   @Param("userId") String userId,
-                                   @Param("brand") String brand,
-                                   @Param("power") String power,
-                                   @Param("mark") String mark,
-                                   @Param("statusList") List<String> status);
-
-    /**
-     * 二手置顶商品列表
-     * @param companyWechatId
-     * @return
-     */
-    List<ESGoodsBean> esGoodsTopList(@Param("companyWechatId") String companyWechatId);
-
-    /**
-     * 二手猜你喜欢
-     * @param companyWechatId
-     * @param typeName
-     * @return
-     */
-    List<String> guessList(@Param("companyWechatId") String companyWechatId, @Param("typeName") String typeName);
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CouponDateMapper.java

@@ -1,14 +0,0 @@
-package com.gree.mall.miniapp.commonmapper;
-
-import com.gree.mall.miniapp.bean.coupon.CouponDataBean;
-import com.gree.mall.miniapp.bean.coupon.CouponDataBean;
-
-public interface CouponDateMapper {
-
-    /**
-     * 券数据
-     * @param couponId
-     * @return
-     */
-    CouponDataBean data(String couponId);
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CustomGoodsCategoryMapper.java

@@ -23,7 +23,7 @@ public interface CustomGoodsCategoryMapper {
             "create_time AS createTime " +
             "FROM goods_category " +
             "WHERE " +
-            "del_flag = 0 " +
+            "1 = 1 " +
             "<if test='level != null'>AND level = #{level}</if> " +
             "<if test='status != null'>AND status = #{status}</if> " +
             " order by sort_num"+

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/CustomWebsitNumberMapper.java

@@ -1,14 +0,0 @@
-package com.gree.mall.miniapp.commonmapper;
-
-import com.baomidou.mybatisplus.annotation.SqlParser;
-import com.gree.mall.miniapp.bean.user.MyProfitBean;
-import com.gree.mall.miniapp.plus.entity.AdminWebsit;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface CustomWebsitNumberMapper {
-
-//    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-//    AdminWebsit queryWebsitNumber(@Param("workUserId") String workUserId,@Param("companyWechatId") String companyWechatId);
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/GoodsFlagUpdateMapper.java

@@ -1,10 +0,0 @@
-package com.gree.mall.miniapp.commonmapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface GoodsFlagUpdateMapper {
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    void updateSecFlag();
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/GoodsSpecDetailMapper.java

@@ -42,16 +42,6 @@ public interface GoodsSpecDetailMapper {
 
 
     /**
-     * 套购商品列表
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public List<GoodsPackageBean> queryGoodsPackage(@Param("userId") String userId,
-                                                    @Param("userType") String userType,
-                                                    @Param("goodsId") String goodsId,
-                                                    @Param("companyWechatId") String companyWechatId);
-
-
-    /**
      * 商品列表
      */
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/MaterialMapper.java

@@ -1,234 +0,0 @@
-package com.gree.mall.miniapp.commonmapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.bean.material.*;
-import com.gree.mall.miniapp.bean.material.parts.*;
-import com.gree.mall.miniapp.bean.material.stock.WorkerNormStockBean;
-import com.gree.mall.miniapp.plus.entity.AdminWebsit;
-import com.gree.mall.miniapp.plus.entity.WebsitPartsSalesItem;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface MaterialMapper {
-
-
-    /**
-     * 购买记录
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<SalesOrderBean> buyList(IPage page, @Param("companyWechatId") String companyWechatId, @Param("userId") String userId, @Param("flag") String flag);
-
-    /**
-     * 网点库存分类
-     *
-     * @param companyWechatId
-     * @param websitId
-     * @return
-     */
-    List<WebsitSalesCategoryVO> existStockCategory(@Param("companyWechatId") String companyWechatId, @Param("websitId") String websitId);
-
-    /**
-     * 网点库存商品
-     *
-     * @param companyWechatId
-     * @param websitId
-     * @return
-     */
-    List<WebsitSalesGoodsVO> existStockGoods(@Param("companyWechatId") String companyWechatId,
-                                             @Param("websitId") String websitId,
-                                             @Param("goodsType") String goodsType,
-                                             @Param("categoryId") String categoryId,
-                                             @Param("goodsName") String goodsName);
-
-    /**
-     * 非网点库存商品
-     *
-     * @param companyWechatId
-     * @param websitId
-     * @return
-     */
-    List<WebsitSalesGoodsVO> notStockGoods(@Param("companyWechatId") String companyWechatId,
-                                             @Param("websitId") String websitId,
-                                             @Param("goodsType") String goodsType,
-                                             @Param("categoryId") String categoryId,
-                                             @Param("goodsName") String goodsName);
-
-    /**
-     *
-     * @param page
-     * @param companyWechatId
-     * @param workerId
-     * @param orderId
-     * @param goodsType
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<NormRecordVO> normRecordList(IPage page,
-                                       @Param("companyWechatId") String companyWechatId,
-                                       @Param("workerId") String workerId,
-                                       @Param("orderId") String orderId,
-                                       @Param("goodsType") String goodsType,
-                                       @Param("startTime") String startTime,
-                                       @Param("endTime") String endTime);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<PartsRefundVO> partsRefundList(Page<Object> objectPage,
-                                         @Param("companyWechatId") String currentCompanyWechatId,
-                                         @Param("workerId") String workerId,
-                                         @Param("type") String type,
-                                         @Param("status") String status);
-
-    /**
-     * 查询购物车的商品清单
-     * @param workerId
-     * @param websitId
-     * @param goodsType
-     * @return
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<WebsitShoppingCartList> queryShoppingCartList(@Param("workerId") String workerId,
-                                                       @Param("websitId") String websitId,
-                                                       @Param("goodsType") String goodsType);
-
-    /**
-     * 收费标准师傅库存
-     * @param goodsId
-     * @param workerId
-     * @return
-     */
-    List<WorkerNormStockBean> queryWorkerStockQty(@Param("goodsId") String goodsId, @Param("workerId") String workerId);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<NewRefundManageBean> appList(IPage page,
-                                       @Param("companyWechatId") String companyWechatId,
-                                       @Param("applyNo") String applyNo,
-                                       @Param("flag") String flag,
-                                       @Param("identity") String identity,
-                                       @Param("partsNumber") String partsNumber);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<PartsSalesOrderBean> appSalesList(Page page,
-                                            @Param("companyWechatId") String companyWechatId,
-                                            @Param("identity") String identity,
-                                            @Param("salesId") String salesId,
-                                            @Param("status") String status,
-                                            @Param("pushFlag") String pushFlag,
-                                            @Param("partsNumber") String partsNumber);
-
-    /**
-     * 带锁的查询
-     * @param websitId
-     * @param salesId
-     * @param partsWebsitId
-     * @param identity
-     * @param pushFlag
-     * @param records
-     * @return
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<WebsitPartsSalesItem> querySalesPushFlagItem(String websitId, String salesId, String partsWebsitId,
-                                                      String identity, String pushFlag, List<SalesItemRecordDTO> records);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<PartsSalesOrderItemBean> selectItemBySalesOrderId(@Param("id") String id);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<OldRefundManageRecordBean> queryOldRefundRecordById(@Param("id") String id);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<String> websitGroupList(@Param("companyWechatId") String companyWechatId, @Param("websitId") String websitId, @Param("partsWebsitId") String partsWebsitId);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<WebsitPartsStockBean> existWebsitStockList(@Param("companyWechatId") String companyWechatId,
-                                                    @Param("websitId") String websitId,
-                                                    @Param("partsWebsitId") String partsWebsitId,
-                                                    @Param("partsNumber") String partsNumber,
-                                                    @Param("partsName") String partsName,
-                                                    @Param("materialGroupName") String materialGroupName);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<AdminWebsit> existWebsitList(@Param("companyWechatId") String companyWechatId, @Param("identity") String identity);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<String> existWebsitGroupList(@Param("companyWechatId") String companyWechatId,
-                                     @Param("identity") String identity,
-                                     @Param("websitId") String websitId,
-                                     @Param("partsWebsitId") String partsWebsitId,
-                                     @Param("partsAttr") String partsAttr);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<PartsWorkerStockBean> existWorkerStockList(@Param("companyWechatId") String companyWechatId,
-                                                    @Param("identity") String identity,
-                                                    @Param("websitId") String websitId,
-                                                    @Param("partsWebsitId") String partsWebsitId,
-                                                    @Param("partsAttr") String partsAttr,
-                                                    @Param("partsNumber") String partsNumber,
-                                                    @Param("partsName") String partsName,
-                                                    @Param("materialGroupName") String materialGroupName,
-                                                    @Param("productRelaId") String productRelaId);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<WebsitPartsSalesItem> querySalesEndTimeByIdentity(@Param("companyWechatId") String companyWechatId,
-                                                           @Param("websitId") String websitId,
-                                                           @Param("partsWebsitId") String partsWebsitId,
-                                                           @Param("identity") String identity);
-
-    /**
-     * 统计查询师傅旧件和新件库存
-     * @param companyWechatId
-     * @param identity
-     * @param websitId
-     * @return
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    WorkerStockCensusBean workerStockStatistics(@Param("companyWechatId") String companyWechatId,
-                                                @Param("identity") String identity,
-                                                @Param("websitId") String websitId);
-
-    /**
-     * 统计查询师傅新件待返还数量和金额
-     * @param companyWechatId
-     * @param identity
-     * @param websitId
-     * @return
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    WorkerStockCensusBean workerNewStockStatistics(@Param("companyWechatId") String companyWechatId,
-                                                   @Param("identity") String identity,
-                                                   @Param("websitId") String websitId);
-
-    /**
-     * 统计查询师傅旧件待返还数量和金额
-     * @param companyWechatId
-     * @param identity
-     * @param websitId
-     * @return
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    WorkerStockCensusBean workerOldStockStatistics(@Param("companyWechatId") String companyWechatId,
-                                                   @Param("identity") String identity,
-                                                   @Param("websitId") String websitId);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<OldRefundManageBean> appOldRefundList(Page page,
-                                                @Param("companyWechatId") String companyWechatId,
-                                                @Param("applyNo") String applyNo,
-                                                @Param("repairFlag") String repairFlag,
-                                                @Param("flag") String flag,
-                                                @Param("identity") String identity,
-                                                @Param("partsNumber") String partsNumber);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<WebsitExtends> queryWebsitList(Page page,
-                                         @Param("companyWechatId") String companyWechatId,
-                                         @Param("websitId") String websitId,
-                                         @Param("longitude") String longitude,
-                                         @Param("latitude") String latitude);
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/SecActivityStageMapper.java

@@ -1,29 +0,0 @@
-package com.gree.mall.miniapp.commonmapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.plus.entity.SecKillActivitySpec;
-import com.gree.mall.miniapp.plus.entity.SecKillStage;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-@Mapper
-public interface SecActivityStageMapper {
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    Integer queryStageCount(@Param("secKillId") String secKillId);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    SecKillStage queryStage(@Param("secKillId") String secKillId);
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<SecKillActivitySpec> querySecGoods(Page page,@Param("secKillId") String secKillId);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public SecKillActivitySpec getSecKillSpecByGoodsSpecId(@Param("goodsSpecId") String goodsSpecId);
-
-    /**
-     * 查询改商品的秒杀活动明细
-     */
-    SecKillActivitySpec getSecKillActivitySpecByGoodId(@Param("companyWechatId")String companyWechatId,@Param("goodId") String goodId);
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/SoldNumMapper.java

@@ -12,7 +12,4 @@ public interface SoldNumMapper {
     @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
     void updateGoodsSpec(@Param("orderDetail") OrderDetail orderDetail);
 
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    void updateSecGoodsSpec(@Param("orderDetail") OrderDetail orderDetail);
-
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/UserInfoMapper.java

@@ -1,15 +0,0 @@
-package com.gree.mall.miniapp.commonmapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.gree.mall.miniapp.bean.user.ServiceWorkerBean;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-@Mapper
-public interface UserInfoMapper {
-//    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-//    ServiceWorkerBean queryWebsit(@Param("userId") String userId);
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    ServiceWorkerBean queryWebsitByWorkId(@Param("workUserId") String workUserId,@Param("corpId") String corpId);
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/WxCustomerMapper.java

@@ -1,36 +0,0 @@
-package com.gree.mall.miniapp.commonmapper;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.gree.mall.miniapp.bean.notice.NoticeParamBean;
-import com.gree.mall.miniapp.bean.tag.TagGroupBean;
-import com.gree.mall.miniapp.bean.tag.UserWxCustomerBean;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface WxCustomerMapper {
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<UserWxCustomerBean> queryCustomerByUser(@Param("userId") String userId,@Param("workUserId") String workUserId);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<TagGroupBean> queryTagList(@Param("unionId") String unionId);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<String> queryCustomTagList(@Param("unionId") String unionId,@Param("workUserId") String workUserId);
-
-    /**
-     * 映射小程序与公众号的openid关系
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public void updateMpMaRela();
-
-    /**
-     * 查询需要推送的通知信息
-     */
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    public List<NoticeParamBean> queryNoticeParam(@Param("type") Integer type, @Param("errNum") Integer errNum, @Param("time") String time);
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/commonmapper/stock/MaterialGoodsStockCMapper.java

@@ -1,47 +0,0 @@
-package com.gree.mall.miniapp.commonmapper.stock;
-
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.material.stock.WebsitStockDTO;
-import com.gree.mall.miniapp.bean.material.stock.WorkerStockBean;
-import com.gree.mall.miniapp.bean.material.stock.WorkerStockDTO;
-import com.gree.mall.miniapp.plus.entity.WebsitGoodsCategory;
-import com.gree.mall.miniapp.plus.entity.WebsitStock;
-import com.gree.mall.miniapp.plus.entity.WorkerStock;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface MaterialGoodsStockCMapper {
-
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<WebsitGoodsCategory> queryWebsitGoodsCategoryList(
-            @Param("websitId") String websitId,
-            @Param("userId") String userId,
-            @Param("goodsType") String goodsType
-    );
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    IPage<WorkerStockBean> queryWorkerStockList(
-            IPage page,
-            @Param("websitId") String websitId,
-            @Param("userId") String userId,
-            @Param("goodsType") String goodsType,
-            @Param("categoryId") String categoryId
-    );
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<WebsitStock> queryExistWebsitStockList(@Param("companyWechatId") String companyWechatId,
-                                                @Param("websitId") String websitId,
-                                                @Param("storageId") String storageId,
-                                                @Param("stockList") List<WebsitStockDTO> stockList);
-
-    @InterceptorIgnore(tenantLine = "1", blockAttack = "1", illegalSql = "1")
-    List<WorkerStock> queryExistWorkerStockList(@Param("companyWechatId") String companyWechatId,
-                                                @Param("workerId") String workerId,
-                                                @Param("stockList") List<WorkerStockDTO> stockList);
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/acitivy/PromotionActivityController.java

@@ -1,56 +0,0 @@
-package com.gree.mall.miniapp.controller.acitivy;
-
-import com.gree.mall.miniapp.bean.activity.PromotionActivityBean;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.acitivy.PromotionActivityLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "扫码活动单API", tags ={"扫码活动单API"} )
-@RequestMapping(value = "/promotion/activity", produces = "application/json; charset=utf-8")
-public class PromotionActivityController {
-
-    @Resource
-    PromotionActivityLogic promotionActivityLogic;
-
-    @PostMapping("/list")
-    @ApiOperation(value = "报名记录-列表")
-    public ResponseHelper<List<PromotionActivityBean>> list(
-            @ApiParam(value = "设置活动id") @RequestParam(required = false) String promotionQuestionnaireId,
-            @ApiParam(value = "页号") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-            @ApiParam(value = "页大小") @RequestParam(required = false, defaultValue = "-1")  Integer pageSize
-    ) {
-        List<PromotionActivityBean> page = promotionActivityLogic.list(pageNum, pageSize, promotionQuestionnaireId);
-        return ResponseHelper.success(page);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "报名记录-详情")
-    public ResponseHelper<PromotionActivityBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String promotionActivityId
-    ) throws RemoteServiceException {
-        PromotionActivityBean bean = promotionActivityLogic.detail(promotionActivityId);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "报名记录-新增")
-    public ResponseHelper add(
-            HttpServletRequest request,
-            @RequestBody PromotionActivityBean bean
-    ) throws Exception {
-        promotionActivityLogic.add(request, bean);
-        return ResponseHelper.success();
-    }
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/acitivy/PromotionApplyController.java

@@ -1,49 +0,0 @@
-package com.gree.mall.miniapp.controller.acitivy;
-
-import com.gree.mall.miniapp.bean.order.OrderBuyBean;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.acitivy.PromotionApplyLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-
-@Slf4j
-@RestController
-@Api(value = "优惠申请API", tags ={"优惠申请API"} )
-@RequestMapping(value = "/promotion/apply", produces = "application/json; charset=utf-8")
-public class PromotionApplyController {
-
-    @Autowired
-    PromotionApplyLogic promotionApplyLogic;
-
-
-    @PostMapping("/apply")
-    @ApiOperation(value = "申请优惠价格")
-    public ResponseHelper page(
-            @ApiParam(value = "昵称手机号",required = true) @RequestBody OrderBuyBean orderBuyBean,
-            HttpServletRequest request
-    ) throws Exception {
-        promotionApplyLogic.apply(orderBuyBean,request);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/examine")
-    @ApiOperation(value = "审核优惠价格")
-    public ResponseHelper examine(
-            @ApiParam(value = "订单号",required = true) @RequestParam String orderId,
-            @ApiParam(value = "审核结果 true=通过 false=驳回",required = true) @RequestParam Boolean examineReuslt,
-            @ApiParam(value = "驳回原因",required = false) @RequestParam(required = false) String promotionApplyRejectRemmark,
-            HttpServletRequest request
-    ) throws Exception {
-        promotionApplyLogic.examine(orderId,examineReuslt,promotionApplyRejectRemmark,request);
-        return ResponseHelper.success();
-    }
-
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/acitivy/PromotionQuestionnaireController.java

@@ -1,41 +0,0 @@
-package com.gree.mall.miniapp.controller.acitivy;
-
-import com.gree.mall.miniapp.bean.promotion.PromotionQuestionnaireAddBean;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.acitivy.PromotionQuestionnaireLogic;
-import com.gree.mall.miniapp.plus.entity.PromotionQuestionnaire;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-import java.util.List;
-
-
-@Slf4j
-@RestController
-@RequiredArgsConstructor
-@Api(value = "问卷活动API", tags ={"问卷活动API"} )
-@RequestMapping(value = "/promotion/questionnaire", produces = "application/json; charset=utf-8")
-public class PromotionQuestionnaireController {
-
-    private final PromotionQuestionnaireLogic promotionQuestionnaireLogic;
-
-    @PostMapping("/list")
-    @ApiOperation(value = "列表")
-    public ResponseHelper<List<PromotionQuestionnaire>> list(
-          @ApiParam(value = "1=进行中 2=已过期 9=我参与的",required = false) @RequestParam(required = false) Integer status
-    ) {
-        List<PromotionQuestionnaire> list = promotionQuestionnaireLogic.list(status);
-        return ResponseHelper.success(list);
-    }
-
-    @ApiOperation(value = "详情")
-    @PostMapping("/detail")
-    public ResponseHelper<PromotionQuestionnaireAddBean> detail(@RequestParam String id) throws Exception {
-        PromotionQuestionnaireAddBean detail = promotionQuestionnaireLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/common/CommonController.java

@@ -146,43 +146,6 @@ public class CommonController {
         return ResponseHelper.success(currentCompanyWechat);
     }
 
-
-    @GetMapping("/scene")
-    @ApiOperation(value = "获取微信scene参数")
-    public ResponseHelper<String> page(
-            @ApiParam(value = "微信scene", required = true) @RequestParam(required = true) String scene
-    ) throws RemoteServiceException {
-        String sceneValue = commonLogic.getSceneValue(scene);
-        return ResponseHelper.success(sceneValue);
-    }
-
-    //企业微信回调
-//    @ApiNotAuth
-//    @RequestMapping(value = "/callback",method = {RequestMethod.GET})
-//    public String rece(
-//            @RequestParam(name="msg_signature") String msgSignature,
-//            @RequestParam(name="timestamp") String timestamp,
-//            @RequestParam(name="nonce") String nonce,
-//            @RequestParam(name="echostr",required = false) String echostr
-//    ) throws AesException {
-//        String s = new WXBizJsonMsgCrypt(workToken, encodingAesKey,corpId)
-//                .VerifyURL(msgSignature, timestamp, nonce, echostr);
-//        return s;
-//    }
-
-    //企业微信回调
-    @ApiNotAuth
-    @RequestMapping(value = "/callback", method = {RequestMethod.POST})
-    public String recePost(
-            @RequestParam(name = "msg_signature", required = false) String msgSignature,
-            @RequestParam(name = "timestamp", required = false) String timestamp,
-            @RequestParam(name = "nonce", required = false) String nonce,
-            @RequestParam(name = "echostr", required = false) String echostr
-    ) throws AesException {
-        //String s = new WXBizJsonMsgCrypt(workToken, encodingAesKey,corpId).VerifyURL(msgSignature, timestamp, nonce, echostr);
-        return "success";
-    }
-
     @GetMapping("/getVerifi")
     @ApiOperation(value = "获取拖拽式验证码")
     public ResponseHelper<Map<String, Object>> getVerifi() {
@@ -226,18 +189,6 @@ public class CommonController {
         return ResponseHelper.success(currentCompanyWechat);
     }
 
-
-//    @PostMapping("/online/pay")
-//    @ApiOperation(value = "所有物流公司")
-//    public ResponseHelper onlinePay(
-//            @ApiParam(value = "key",required = true) @RequestParam(required = true) String key,
-//            @ApiParam(value = "openId",required = true) @RequestParam(required = true) String openId
-//    ) throws IOException, RemoteServiceException {
-//        Map<String, Object> stringObjectMap = fucaiLogic.onlinePay(key, openId);
-//        return ResponseHelper.success(stringObjectMap);
-//    }
-
-
     @ApiNotAuth
     @GetMapping("/getfile")
     public ResponseHelper<String> getfile(@RequestParam(required = true) String id) {
@@ -246,40 +197,6 @@ public class CommonController {
         return ResponseHelper.success(taxLink);
     }
 
-
-//    @ApiNotAuth
-//    @GetMapping("/token/get")
-//    public ResponseHelper<String> getToken() throws RemoteServiceException {
-//        return ResponseHelper.success(wechatLogic.getAccessToken());
-//    }
-
-//    @PostMapping("/jindie")
-//    public ResponseHelper jindie(
-//           @RequestParam List<String> orderIds
-//    ) throws RemoteServiceException {
-//        for(String orderId : orderIds) {
-//            OrderInfo orderInfo = orderInfoService.getById(orderId);
-//            List<OrderDetail> list = orderDetailService.lambdaQuery().eq(OrderDetail::getOrderId, orderId).list();
-//
-//            fucaiLogic.sendSaleOrder(list,orderInfo,orderInfo.getWebsitNumber());
-//        }
-//        return ResponseHelper.success();
-//    }
-
-//    @PostMapping("/jindie2")
-//    public ResponseHelper jindie2(
-//            @RequestParam String orderId
-//    ) throws RemoteServiceException {
-//
-//            OrderInfo orderInfo = orderInfoService.getById(orderId);
-//            List<OrderDetail> list = orderDetailService.lambdaQuery().eq(OrderDetail::getOrderId, orderId).list();
-//
-//            fucaiLogic.sendSaleOrder(list,orderInfo,orderInfo.getWebsitNumber());
-//
-//        return ResponseHelper.success();
-//    }
-
-
     @ApiNotAuth
     @GetMapping("/oss/config")
     public ResponseHelper getOSSConfig() throws UnsupportedEncodingException {

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/common/PayController.java

@@ -58,26 +58,9 @@ public class PayController {
                 if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
                     log.error("【支付回调】，请勿重复请求，orderId:{}",id);
                 }else{
-                    if ("XM,XP".contains(id.substring(0, 2))) {
-                        // 辅材、配件
-                        payLogic.payCall2(id, transactionId, totalFee, params);
-                    } else if ("BS".contains(id.substring(0, 2))) {
-                        // 软件服务
-                        payLogic.payCall3(id, transactionId, totalFee, params);
-
-                    } else if ("YB".contains(id.substring(0, 2))) {
-                        //延保
-                        payLogic.payCall4(id, transactionId, totalFee, params);
-                    } else if ("ZP".contains(id.substring(0, 2))) {
-                        // 租赁
-                        payLogic.payCall5(id, transactionId, totalFee, params);
-                    } else if ("ES".contains(id.substring(0, 2))) {
-                        // 二手订单
-                        payLogic.payCall6(id, transactionId, totalFee, params);
-                    } else {
-                        //商城订单支付回调
-                        payLogic.payCall(id, transactionId, totalFee);
-                    }
+                    //商城订单支付回调
+                    payLogic.payCall(id, transactionId, totalFee);
+
                 }
             }catch(Exception e) {
                 log.error("处理支付回调失败",e);
@@ -108,12 +91,5 @@ public class PayController {
         return WeChatUtils.getRequestXml(returnData);
     }
 
-    @ApiNotAuth
-    @PostMapping("/allinpay/callback")
-    @ApiOperation(value = "通联回调")
-    public String allinpayCallback(HttpServletRequest request) throws Exception {
-        payLogic.allinpayCallback(request);
-        return "success";
-    }
 
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/engin/ProjectRepairController.java

@@ -1,85 +0,0 @@
-package com.gree.mall.miniapp.controller.engin;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.bean.engin.RpProjectRepairBean;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.engin.ProjectRepairLogic;
-import com.gree.mall.miniapp.plus.entity.RpProjectRepair;
-import com.gree.mall.miniapp.plus.entity.RpProjectRepairProduct;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "工程维保API", tags = {"工程维保API"})
-@Validated
-@RequestMapping(value = "/engin/project/repair", produces = "application/json; charset=utf-8")
-public class ProjectRepairController {
-
-    @Resource
-    ProjectRepairLogic projectRepairLogic;
-
-    @PostMapping("/list")
-    @ApiOperation(value = "工程维保-列表")
-    public ResponseHelper<Page<RpProjectRepair>> list(
-            @RequestParam(required = false) String id,
-            @RequestParam Integer pageNum,
-            @RequestParam Integer pageSize
-    ) {
-        IPage<RpProjectRepair> list = projectRepairLogic.list(id, pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "工程维保-详情")
-    public ResponseHelper<RpProjectRepairBean> detail(
-            @ApiParam(value = "id", required = true)   @RequestParam(required = true) String id
-    ) throws RemoteServiceException {
-        RpProjectRepairBean detail = projectRepairLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/brand")
-    @ApiOperation("工程维保-品牌(已去重)")
-    public ResponseHelper<List<RpProjectRepairProduct>> brand(
-            @ApiParam(value = "维保id",required = true) @RequestParam String repairProjectId
-    ){
-        List<RpProjectRepairProduct> brands = projectRepairLogic.brand(repairProjectId);
-        return ResponseHelper.success(brands);
-    }
-
-    @PostMapping("/main")
-    @ApiOperation("工程维保-大类(已去重)")
-    public ResponseHelper<List<RpProjectRepairProduct>> main(
-            @ApiParam(value = "维保id",required = true) @RequestParam String repairProjectId,
-            @ApiParam(value = "品牌id",required = false) @RequestParam String brandId
-    ){
-        List<RpProjectRepairProduct> mains = projectRepairLogic.main(repairProjectId, brandId);
-        return ResponseHelper.success(mains);
-    }
-
-    @PostMapping("/small")
-    @ApiOperation("工程维保-小类(已去重)")
-    public ResponseHelper<List<RpProjectRepairProduct>> small(
-            @ApiParam(value = "维保id",required = true) @RequestParam String repairProjectId,
-            @ApiParam(value = "品牌id",required = false) @RequestParam(required = false) String brandId,
-            @ApiParam(value = "大类id",required = false) @RequestParam(required = false) String mainId
-    ){
-        List<RpProjectRepairProduct> small = projectRepairLogic.small(repairProjectId, brandId, mainId);
-        return ResponseHelper.success(small);
-    }
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/engin/RpMaterialController.java

@@ -1,191 +0,0 @@
-package com.gree.mall.miniapp.controller.engin;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.bean.order.MaterialOrderBuy;
-import com.gree.mall.miniapp.bean.order.WorkerOrderBuy;
-import com.gree.mall.miniapp.bean.order.WorkerOrderDetail;
-import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
-import com.gree.mall.miniapp.bean.workorder.RpMaterialOrderCount;
-import com.gree.mall.miniapp.bean.workorder.RpMaterialOrderVO;
-import com.gree.mall.miniapp.constant.Constant;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.engin.RpMaterialLogic;
-import com.gree.mall.miniapp.plus.entity.*;
-import com.gree.mall.miniapp.utils.IpUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "工程维保费用记录", tags = {"工程维保费用记录"})
-@RequestMapping(value = "/engin/material", produces = "application/json; charset=utf-8")
-public class RpMaterialController {
-
-    @Resource
-    RpMaterialLogic rpMaterialLogic;
-
-    @Autowired
-    RedisLockRegistry redisLockRegistry;
-
-    @PostMapping("/list/page")
-    @ApiOperation(value = "工程维保费用记录列表")
-    public ResponseHelper<Page<RpMaterialOrder>> page(
-            @ApiParam(value = "审批状态 WAIT 待审 OK 审批  FAIL 驳回  PAID 现场支付 NO 取消 NO_PAID 未支付",required =false)
-            @RequestParam(required = false) String examineStatus,
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
-
-    ) throws RemoteServiceException {
-        IPage<RpMaterialOrder> page = rpMaterialLogic.page(examineStatus, pageNum, pageSize);
-        return ResponseHelper.success(page);
-    }
-
-
-    @PostMapping("/list/pageCount")
-    @ApiOperation(value = "工程维保费用记录统计")
-    public ResponseHelper<RpMaterialOrderCount> pageCount(
-
-
-    ) throws RemoteServiceException {
-        RpMaterialOrderCount page = rpMaterialLogic.pageCount();
-        return ResponseHelper.success(page);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "工程维保费用记录详情")
-    public ResponseHelper<RpMaterialOrderVO> detail(
-            @ApiParam(value = "id", required = true)   @RequestParam(required = true) String id
-
-
-    ) throws RemoteServiceException {
-        RpMaterialOrderVO rpMaterialOrder = rpMaterialLogic.detail(id);
-        return ResponseHelper.success(rpMaterialOrder);
-    }
-
-
-    @PostMapping("/buy")
-    @ApiOperation(value = "提交订单,返回订单号")
-    public ResponseHelper<String> buy(
-            @RequestBody MaterialOrderBuy materialOrderBuy,
-            HttpServletRequest request
-    ) throws Exception {
-        String ip = IpUtil.getIpAddr(request);
-        String workerOrderDetail = rpMaterialLogic.buy(materialOrderBuy,ip,request);
-        return ResponseHelper.success(workerOrderDetail);
-    }
-
-
-
-    @PostMapping("/cancel")
-    @ApiOperation(value = "取消订单")
-    public ResponseHelper cancel(
-            @ApiParam(required = true, value = "订单号") @RequestParam(required = true) String orderId
-
-    ) throws Exception {
-        rpMaterialLogic.cancel(orderId);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/paid")
-    @ApiOperation(value = "扫码支付获得结果")
-    public ResponseHelper<Boolean> paid(
-            @ApiParam(required = true, value = "订单号") @RequestParam(required = true) String orderId,
-            @ApiParam(required = false, value = "扫付款码得到得code") @RequestParam(required = false) String authCode,
-            @ApiParam(required = true, value = "WECHAT 微信支付  LINE 线下支付") @RequestParam(required = true) String payType,
-            HttpServletRequest request
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + orderId);
-        try {
-            if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-                throw new RemoteServiceException("系统繁忙，请稍后再试");
-            }
-            String ip = IpUtil.getIpAddr(request);
-            Boolean payStatus = rpMaterialLogic.paid(orderId,authCode,ip,payType);
-            return ResponseHelper.success(payStatus);
-        } finally {
-            obtain.unlock();
-        }
-
-    }
-
-    @PostMapping("/apply")
-    @ApiOperation(value = "确认申请")
-    public ResponseHelper<String> cancel(
-            @RequestBody MaterialOrderBuy materialOrderBuy,
-            HttpServletRequest request
-    ) throws Exception {
-        String workerOrderDetail =rpMaterialLogic.apply(materialOrderBuy);
-        return ResponseHelper.success(workerOrderDetail);
-    }
-
-
-    @PostMapping("/detailWorker")
-    @ApiOperation(value = "工程维保费用记录详情-电子支付列表")
-    public ResponseHelper<List<RpMaterialOrderVO>> detailWorker(
-            @ApiParam(value = "工单号", required = true)   @RequestParam(required = true) String workerOrderId
-
-
-    ) throws RemoteServiceException {
-        List<RpMaterialOrderVO> rpMaterialOrder = rpMaterialLogic.detailWorker(workerOrderId);
-        return ResponseHelper.success(rpMaterialOrder);
-    }
-
-    @PostMapping("/isBy")
-    @ApiOperation(value = "用工程维保费用记录-是否可以审批")
-    public ResponseHelper<Boolean> isBy(
-
-            @ApiParam(value = "工单号",required = true) @RequestParam(required = true) String orderBaserId
-
-    ) throws Exception {
-
-        Boolean isBy = rpMaterialLogic.isBy(orderBaserId);
-
-        return ResponseHelper.success(isBy);
-    }
-
-
-    @PostMapping("/examine")
-    @ApiOperation(value = "工程维保费用记录-审批")
-    public ResponseHelper examine(
-            @ApiParam(value = "申请单号",required = true) @RequestParam(required = true) String id,
-            @ApiParam(value = "审批状态 WAIT 待审 OK 审批  FAIL 驳回  PAID 现场支付 NO 取消 NO_PAID 未支付",required = true) @RequestParam(required = true) String examineStatus,
-            @ApiParam(value = "审批备注",required = false) @RequestParam(required = false) String examineRemark
-
-    ) throws Exception {
-
-        rpMaterialLogic.examine(id,examineRemark,examineStatus);
-
-        return ResponseHelper.success();
-    }
-
-
-
-
-    @PostMapping("/cancelOrder")
-    @ApiOperation(value = "工程维保费用记录-取消")
-    public ResponseHelper cancelOrder(
-            @ApiParam(value = "申请单号",required = true) @RequestParam(required = true) String id
-
-    ) throws Exception {
-
-        rpMaterialLogic.cancelOrder(id);
-
-        return ResponseHelper.success();
-    }
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/es/ESGoodsController.java

@@ -1,183 +0,0 @@
-package com.gree.mall.miniapp.controller.es;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.es.ESGoodsBean;
-import com.gree.mall.miniapp.bean.es.ESGoodsOtherCountBean;
-import com.gree.mall.miniapp.bean.es.GuessBean;
-import com.gree.mall.miniapp.constant.Constant;
-import com.gree.mall.miniapp.enums.es.ESGoodsStatusEnum;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.es.ESGoodsLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.constraints.NotBlank;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@Validated
-@RestController
-@Api(value = "二手商品API", tags ={"二手商品API"} )
-@RequestMapping(value = "/es/goods", produces = "application/json; charset=utf-8")
-public class ESGoodsController {
-
-    @Resource
-    ESGoodsLogic esGoodsLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @PostMapping("/list")
-    @ApiOperation(value = "二手商品-列表")
-    public ResponseHelper<IPage<ESGoodsBean>> list(
-            @ApiParam(value = "排序类型 A=默认 B=在售商品 C=人气最高") @RequestParam(required = false) String sortType,
-            @ApiParam(value = "商品名称") @RequestParam(required = false) String goodsName,
-            @ApiParam(value = "商品分类") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "用户id") @RequestParam(required = false) String userId,
-            @ApiParam(value = "品牌") @RequestParam(required = false) String brand,
-            @ApiParam(value = "功率") @RequestParam(required = false) String power,
-            @ApiParam(value = "能效") @RequestParam(required = false) String mark,
-            @ApiParam(value = "状态 ON=上架 OFF=下架 SALE=已卖出") @RequestParam(required = false) List<String> status,
-            @ApiParam(value = "页号") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-            @ApiParam(value = "页大小") @RequestParam(required = false, defaultValue = "-1")  Integer pageSize
-    ) {
-        IPage<ESGoodsBean> page = esGoodsLogic.list(pageNum, pageSize, sortType, goodsName, categoryId, userId, brand,
-                power, mark, status);
-        return ResponseHelper.success(page);
-    }
-
-    @PostMapping("/top/list")
-    @ApiOperation(value = "二手商品-置顶列表")
-    public ResponseHelper<List<ESGoodsBean>> topList() {
-        List<ESGoodsBean> page = esGoodsLogic.topList();
-        return ResponseHelper.success(page);
-    }
-
-    @PostMapping("/guess/list")
-    @ApiOperation(value = "二手商品-猜你喜欢")
-    public ResponseHelper<GuessBean> guessList() {
-        GuessBean bean = esGoodsLogic.guessList();
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/other/count")
-    @ApiOperation(value = "二手商品-其他统计")
-    public ResponseHelper<ESGoodsOtherCountBean> otherCount(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) {
-        ESGoodsOtherCountBean bean = esGoodsLogic.otherCount(id);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "二手商品-详情")
-    public ResponseHelper<ESGoodsBean> detail(
-            @ApiParam(value = "id", required = true) @RequestParam String id
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.ES_GOODS_LOCK + ":" + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            ESGoodsBean bean = esGoodsLogic.detail(id);
-            return ResponseHelper.success(bean);
-        } finally {
-            obtain.unlock();
-        }
-    }
-
-    @PostMapping("/add")
-    @ApiOperation(value = "二手商品-新增")
-    public ResponseHelper add(
-            HttpServletRequest request,
-            @RequestBody ESGoodsBean bean
-    ) throws Exception {
-        esGoodsLogic.add(request, bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/update")
-    @ApiOperation(value = "二手商品-编辑")
-    public ResponseHelper update(
-            HttpServletRequest request,
-            @RequestBody ESGoodsBean bean
-    ) throws Exception {
-        esGoodsLogic.update(request, bean);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/copy")
-    @ApiOperation(value = "二手商品-克隆")
-    public ResponseHelper<String> copy(
-            @ApiParam(value = "商品id", required = true) @RequestParam String id
-    ) throws Exception {
-        String newId = esGoodsLogic.copy(id);
-        return ResponseHelper.success(newId);
-    }
-
-    @PostMapping("/del")
-    @ApiOperation(value = "二手商品-删除")
-    public ResponseHelper del(
-            @ApiParam(value = "商品id", required = true) @RequestParam String id
-    ) throws Exception {
-        esGoodsLogic.del(id);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/praise")
-    @ApiOperation(value = "二手商品-点赞")
-    public ResponseHelper<ESGoodsBean> praise(
-            @ApiParam(value = "商品id", required = true) @RequestParam String id,
-            @ApiParam(value = "true=是 false=否", required = true) @RequestParam Boolean isPraise
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.ES_GOODS_LOCK + ":p" + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            ESGoodsBean bean = esGoodsLogic.praise(id, isPraise);
-            return ResponseHelper.success(bean);
-        } finally {
-            obtain.unlock();
-        }
-    }
-
-    @PostMapping("/message")
-    @ApiOperation(value = "二手商品-留言")
-    public ResponseHelper<ESGoodsBean> message(
-            @ApiParam(value = "商品id", required = true) @RequestParam String id,
-            @ApiParam(value = "留言id") @RequestParam String messageId,
-            @ApiParam(value = "内容", required = true) @NotBlank(message = "留言不能为空") @RequestParam String content
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.ES_GOODS_LOCK + ":m" + id + messageId);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        try {
-            esGoodsLogic.message(id, messageId, content);
-            return ResponseHelper.success();
-        } finally {
-            obtain.unlock();
-        }
-    }
-
-    @PostMapping("/update/status")
-    @ApiOperation(value = "二手商品-操作")
-    public ResponseHelper<ESGoodsBean> updateStatus(
-            @ApiParam(value = "商品id", required = true) @RequestParam String id,
-            @ApiParam(value = "ON=上架 OFF=下架 SALE=已卖出", required = true) @RequestParam ESGoodsStatusEnum status
-    ) throws Exception {
-        esGoodsLogic.updateStatus(id, status);
-        return ResponseHelper.success();
-    }
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/es/OrderPayController.java

@@ -1,237 +0,0 @@
-package com.gree.mall.miniapp.controller.es;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.bean.PayDetail;
-import com.gree.mall.miniapp.bean.es.EsOrderBuyBean;
-import com.gree.mall.miniapp.bean.es.EsOrderInfoBean;
-import com.gree.mall.miniapp.bean.order.OrderBuyBean;
-import com.gree.mall.miniapp.constant.Constant;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.es.OrderPayLogic;
-
-import com.gree.mall.miniapp.plus.entity.EsOrderInfo;
-import com.gree.mall.miniapp.plus.entity.EsOrderRefund;
-import com.gree.mall.miniapp.utils.IpUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import io.swagger.annotations.ApiParam;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-/**
- * @author change
- */
-@RequiredArgsConstructor
-@Validated
-@RestController
-@Api(value = "二手订单API", tags ={"二手订单API"} )
-@RequestMapping(value = "/es/orderPay", produces = "application/json; charset=utf-8")
-public class OrderPayController {
-
-    @Autowired
-    OrderPayLogic orderPayLogic;
-
-    @Autowired
-    RedisLockRegistry redisLockRegistry;
-
-
-
-    @PostMapping("/buy")
-    @ApiOperation(value = "提交订单")
-    public ResponseHelper<PayDetail> buy(
-            @RequestBody EsOrderBuyBean esOrderBuyBean,
-            HttpServletRequest request
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + esOrderBuyBean.getEsGoodsId());
-        try {
-            if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-                throw new RemoteServiceException("系统繁忙，请稍后再试");
-            }
-            String ip = IpUtil.getIpAddr(request);
-            PayDetail buy = orderPayLogic.buy(esOrderBuyBean,ip,request);
-
-            return ResponseHelper.success(buy);
-        } finally {
-            obtain.unlock();
-        }
-
-    }
-
-
-    @PostMapping("/wait/pay")
-    @ApiOperation(value = "支付待支付订单")
-    public ResponseHelper<PayDetail> waitPayOrder(
-            @ApiParam(value = "订单id",required = true) @RequestParam(required = false) String esOrderId,
-            HttpServletRequest request
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + esOrderId);
-        try {
-            if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-                throw new RemoteServiceException("系统繁忙，请稍后再试");
-            }
-            String ip = IpUtil.getIpAddr(request);
-            PayDetail payDetail = orderPayLogic.waitPayOrder(esOrderId,ip);
-
-            return ResponseHelper.success(payDetail);
-        } finally {
-            obtain.unlock();
-        }
-    }
-
-    @PostMapping("/wait/notPay")
-    @ApiOperation(value = "取消支付")
-    public ResponseHelper notPay(
-            @ApiParam(value = "订单id",required = true) @RequestParam String orderId,
-            HttpServletRequest request
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + orderId);
-        try {
-            if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-                throw new RemoteServiceException("系统繁忙，请稍后再试");
-            }
-            String ip = IpUtil.getIpAddr(request);
-            orderPayLogic.notPay(orderId,ip);
-            return ResponseHelper.success();
-        } finally {
-            obtain.unlock();
-        }
-    }
-
-    @PostMapping("/send")
-    @ApiOperation("发货")
-    public ResponseHelper send(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId,
-            @ApiParam(value = "是否自提 YES是 NO否", required = true) @RequestParam(required = true) String pickType,
-            @ApiParam(value = "快递单号", required = false) @RequestParam(required = false) String logisticsNo,
-            @ApiParam(value = "快递公司code", required = false) @RequestParam(required = false) String logisticsCode,
-            @ApiParam(value = "快递公司名称", required = false) @RequestParam(required = false) String logisticsName
-    ) {
-        orderPayLogic.send(esOrderId,pickType,logisticsNo,logisticsCode,logisticsName);
-        return ResponseHelper.success();
-    }
-
-
-
-    @PostMapping("/payPrice")
-    @ApiOperation("确认收款")
-    public ResponseHelper payPrice(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId,
-                 @ApiParam(value = "金额", required = false) @RequestParam(required = false) BigDecimal price,
-            @ApiParam(value = "收款凭证", required = false) @RequestParam(required = false) String fileUrl,
-            @ApiParam(value = "备注", required = false) @RequestParam(required = false) String remark
-
-    ) {
-        orderPayLogic.payPrice(esOrderId,price,fileUrl,remark);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/payOk")
-    @ApiOperation("线下单确认订单")
-    public ResponseHelper payPrice(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId
-    ) {
-        orderPayLogic.payOk(esOrderId);
-        return ResponseHelper.success();
-    }
-
-
-
-    @PostMapping("/okSend")
-    @ApiOperation("线下单确认收货")
-    public ResponseHelper okSend(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId
-
-
-    ) {
-        orderPayLogic.okSend(esOrderId);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/list")
-    @ApiOperation("列表")
-    public ResponseHelper<Page<EsOrderInfo>> list(
-            @ApiParam(value = "订单号", required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "产品名称", required = false) @RequestParam(required = false) String esGoodsName,
-            @ApiParam(value = "买家名称", required = false) @RequestParam(required = false) String userName,
-            @ApiParam(value = "卖家名称", required = false) @RequestParam(required = false) String sellName,
-            @ApiParam(value = "买家手机", required = false) @RequestParam(required = false) String userMobile,
-            @ApiParam(value = "卖家手机", required = false) @RequestParam(required = false) String sellMobile,
-            @ApiParam(value = "订单状态 SAVE 待付款 WAIT 待确认  PAID 待发货 SEND 卖家发货  OVER 交易完成 TIME_OUT 超时 CANCEL 取消/关闭  WAIT_REFUND 售后中", required = false) @RequestParam(required = false) List<String> status,
-            @ApiParam(value = "开始创建时间", required = false) @RequestParam(required = false) String startCreateTime,
-            @ApiParam(value = "结束创建时间", required = false) @RequestParam(required = false) String endCreateTime,
-            @ApiParam(value = "开始支付时间", required = false) @RequestParam(required = false) String startPayTime,
-            @ApiParam(value = "结束支付时间", required = false) @RequestParam(required = false) String endPayTime,
-            @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize,
-
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        IPage<EsOrderInfo> list = orderPayLogic
-                .list(request,esGoodsName,orderId, sellName, userName, userMobile,sellMobile, status, startCreateTime,
-                        endCreateTime, startPayTime, endPayTime,pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation("订单详情")
-    public ResponseHelper<EsOrderInfoBean> detail(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId
-    ) {
-        EsOrderInfoBean detail = orderPayLogic.detail(esOrderId);
-        return ResponseHelper.success(detail);
-    }
-
-
-    @PostMapping("/refund")
-    @ApiOperation("发起退款")
-    public ResponseHelper refund(
-            @ApiParam(value = "订单号", required = true) @RequestParam(required = true) String esOrderId,
-            @ApiParam(value = "退货原因", required = true) @RequestParam(required = true) String refundNote,
-            @ApiParam(value = "处理方式 REFUND 退款  GOODS_REFUND 退货退款  FAIL 驳回 GOODS 退货", required = true) @RequestParam(required = true) String refundType,
-            @ApiParam(value = "退货凭证", required = false) @RequestParam(required = false) List<String> fileUrls
-    ) {
-        orderPayLogic.refund(esOrderId,refundType,fileUrls,refundNote);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/listRefund")
-    @ApiOperation("退货列表")
-    public ResponseHelper<Page<EsOrderRefund>> listRefund(
-            @ApiParam(value = "订单号", required = false) @RequestParam(required = false) String orderId,
-            @ApiParam(value = "产品名称", required = false) @RequestParam(required = false) String esGoodsName,
-            @ApiParam(value = "买家名称", required = false) @RequestParam(required = false) String userName,
-            @ApiParam(value = "卖家名称", required = false) @RequestParam(required = false) String sellName,
-            @ApiParam(value = "买家手机", required = false) @RequestParam(required = false) String userMobile,
-            @ApiParam(value = "卖家手机", required = false) @RequestParam(required = false) String sellMobile,
-            @ApiParam(value = "处理方式 REFUND 退款  GOODS_REFUND 退货退款  FAIL 驳回 GOODS 退货", required = false) @RequestParam(required = false) List<String> status,
-            @ApiParam(value = "开始创建时间", required = false) @RequestParam(required = false) String startCreateTime,
-            @ApiParam(value = "结束创建时间", required = false) @RequestParam(required = false) String endCreateTime,
-            @ApiParam(value = "开始支付时间", required = false) @RequestParam(required = false) String startPayTime,
-            @ApiParam(value = "结束支付时间", required = false) @RequestParam(required = false) String endPayTime,
-            @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize,
-
-            HttpServletRequest request
-    ) throws RemoteServiceException {
-        IPage<EsOrderRefund> list = orderPayLogic
-                .listRefund(request,esGoodsName,orderId, sellName, userName, userMobile,sellMobile, status, startCreateTime,
-                        endCreateTime, startPayTime, endPayTime,pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/goods/GoodsController.java

@@ -218,25 +218,5 @@ public class GoodsController {
     }
 
 
-//    @PostMapping("/cut")
-//    @ApiOperation("让利二维码或链接")
-//    public ResponseHelper<String> cut(
-//            @RequestBody List<CutGoodsBean> cutGoodsBeans,
-//            HttpServletRequest request
-//    ) throws IOException {
-//        String cutQrcode = goodsLogic.getCutQrcode(cutGoodsBeans, request);
-//        return ResponseHelper.success(cutQrcode);
-//    }
-
-    @GetMapping("/package/choice")
-    @ApiOperation("团购商品-选购列表")
-    public ResponseHelper<List<List<GoodsPackageBean>>> choicePackage(
-            @ApiParam(value = "套购商品id",required = true) @RequestParam String goodsId,
-            HttpServletRequest request
-    ) throws IOException {
-        List<List<GoodsPackageBean>> lists = goodsLogic.choicePackage(goodsId, request);
-        return ResponseHelper.success(lists);
-    }
-
 
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/MaterialSalesController.java

@@ -1,210 +0,0 @@
-package com.gree.mall.miniapp.controller.material;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.annotation.ApiNotAuth;
-import com.gree.mall.miniapp.bean.PayDetail;
-import com.gree.mall.miniapp.bean.material.*;
-import com.gree.mall.miniapp.constant.Constant;
-import com.gree.mall.miniapp.constant.SybConstants;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.WebsitSalesLogic;
-import com.gree.mall.miniapp.plus.entity.AdminWebsitPayConfig;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "辅配销售API", tags ={"辅配销售API"} )
-@RequestMapping(value = "/material/salses", produces = "application/json; charset=utf-8")
-public class MaterialSalesController {
-
-    @Resource
-    WebsitSalesLogic websitSalesLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @PostMapping("/buy/list")
-    @ApiOperation(value = "购买记录")
-    public ResponseHelper<IPage<SalesOrderBean>> buyList(
-            @ApiParam(value = "单据状态 SAVE=保存 SUBMIT=提交 PAY_NOT_TAKE=已支付,未提货 PAY_TAKE=已支付,已提货 CANCEL=取消订单") @RequestParam(required = false) String flag,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) {
-        IPage<SalesOrderBean> page = websitSalesLogic.buyList(flag, pageNum, pageSize, request);
-        return ResponseHelper.success(page);
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "购买记录详情")
-    public ResponseHelper<SalesOrderBean> detail(
-            HttpServletRequest request,
-            @ApiParam(value = "单据编号",required = true) @RequestParam String salesId
-    ) throws RemoteServiceException {
-        SalesOrderBean detail = websitSalesLogic.detail(request, salesId);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("count")
-    @ApiOperation(value = "购买记录统计")
-    public ResponseHelper<MyDataCountBean> count(
-            HttpServletRequest request
-    ) {
-        MyDataCountBean bean = websitSalesLogic.count(request);
-        return ResponseHelper.success(bean);
-    }
-
-    @PostMapping("/cancel")
-    @ApiOperation(value = "取消订单")
-    public ResponseHelper cancel(
-            HttpServletRequest request,
-            @ApiParam(value = "单据编号",required = true) @RequestParam String salesId
-    ) throws RemoteServiceException {
-        websitSalesLogic.cancel(request, salesId);
-        return ResponseHelper.success();
-    }
-//    @PostMapping("/pay")
-//    @ApiOperation(value = "支付")
-//    public ResponseHelper<PayDetail> pay(
-//            HttpServletRequest request,
-//            @ApiParam(value = "单据编号",required = true) @RequestParam String salesId,
-//            @ApiParam(value = "是否小程序兼容",required = false) @RequestParam (required = false) Boolean miniPay,
-//            @ApiParam(value = "openId",required = false) @RequestParam(required = false) String openId
-//    ) throws RemoteServiceException {
-//        PayDetail detail = websitSalesLogic.pay(request, salesId,miniPay,openId);
-//        return ResponseHelper.success(detail);
-//    }
-
-    @PostMapping("/exist/stock/category")
-    @ApiOperation(value = "辅材库存分类")
-    public ResponseHelper<List<WebsitSalesCategoryVO>> existStockCategory(
-            HttpServletRequest request,
-            @ApiParam(value = "网点编号", required = true) @RequestParam String websitId
-    ) throws RemoteServiceException {
-        List<WebsitSalesCategoryVO> list = websitSalesLogic.existStockCategory(request, websitId);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/exist/stock/goods")
-    @ApiOperation(value = "网点销售订单-辅材库存")
-    public ResponseHelper<List<WebsitSalesGoodsVO>> existStockGoods(
-            HttpServletRequest request,
-            @ApiParam(value = "网点编号", required = true) @RequestParam String websitId,
-            @ApiParam(value = "分类id") @RequestParam(required = false) String categoryId,
-            @ApiParam(value = "商品类型 M=辅材 P=配件", required = true) @RequestParam String type,
-            @ApiParam(value = "商品名称", required = true) @RequestParam(required = false) String goodsName
-    ) throws RemoteServiceException {
-        List<WebsitSalesGoodsVO> list = websitSalesLogic.existStockGoods(request, websitId, categoryId, type, goodsName);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/list")
-    @ApiOperation("购物车列表")
-    public ResponseHelper<List<WebsitShoppingCartList>> list(
-            @ApiParam(value = "师傅号",required = true) @RequestParam String workerId,
-            @ApiParam(value = "网点号",required = true) @RequestParam String websitId,
-            @ApiParam(value = "商品类型 M=辅材 P=配件",required = true) @RequestParam String goodsType
-    ){
-        List<WebsitShoppingCartList> shoppingCartLists = websitSalesLogic.queryShoppingCart(workerId, websitId, goodsType);
-        return ResponseHelper.success(shoppingCartLists);
-    }
-
-    @PostMapping("/add")
-    @ApiOperation("添加到购物车并提交")
-    public ResponseHelper<List<WebsitShoppingCartList>> addShoppingCart(@RequestBody WebsitShoppingCartBean shoppingCartBean, HttpServletRequest request) throws Exception {
-        List<WebsitShoppingCartList> shoppingCartLists = websitSalesLogic.addShoppingCart(shoppingCartBean, request);
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + ":" + shoppingCartBean.getWebsitId() + shoppingCartBean.getGoodsType());
-        if(!obtain.tryLock(10, TimeUnit.SECONDS)){
-            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-        }
-        String salesId;
-        try {
-            salesId = websitSalesLogic.add(shoppingCartBean.getWebsitId(), shoppingCartBean.getGoodsType(), shoppingCartBean.getRemark(), request);
-        }finally {
-            obtain.unlock();
-        }
-        return ResponseHelper.success(salesId);
-    }
-
-    @PostMapping("/clear")
-    @ApiOperation("清空购物车")
-    public ResponseHelper clearShoppingCart(
-            @ApiParam(value = "师傅号",required = true) @RequestParam String workerId,
-            @ApiParam(value = "网点号",required = true) @RequestParam String websitId,
-            @ApiParam(value = "商品类型 M=辅材 P=配件",required = true) @RequestParam String goodsType
-    ){
-        websitSalesLogic.clearShoppingCart(workerId, websitId, goodsType);
-        return ResponseHelper.success();
-    }
-
-//    @PostMapping("/add")
-//    @ApiOperation(value = "销售订单-添加")
-//    public ResponseHelper add(
-//            @ApiParam(value = "网点号",required = true) @RequestParam String websitId,
-//            @ApiParam(value = "商品类型 M=辅材 P=配件",required = true) @RequestParam String goodsType,
-//            @ApiParam(value = "备注",required = true) @RequestParam String remark,
-//            HttpServletRequest request
-//    ) throws Exception {
-//        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + ":" + websitId + goodsType);
-//        if(!obtain.tryLock(10, TimeUnit.SECONDS)){
-//            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-//        }
-//        String salesId;
-//        try {
-//            salesId = websitSalesLogic.add(websitId, goodsType, remark, request);
-//        }finally {
-//            obtain.unlock();
-//        }
-//        return ResponseHelper.success(salesId);
-//    }
-
-    @PostMapping("/get/pay/config")
-    @ApiOperation("获取支付配置")
-    public ResponseHelper<List<AdminWebsitPayConfig>> getPayConfig(
-            @ApiParam(value = "网点号",required = true) @RequestParam String websitId,
-            @ApiParam(value = "商品类型 M=辅材 P=配件",required = true) @RequestParam String goodsType,
-            HttpServletRequest request
-    ){
-        List<AdminWebsitPayConfig> configList = websitSalesLogic.getPayConfig(websitId, goodsType, request);
-        return ResponseHelper.success(configList);
-    }
-
-//    @PostMapping("/save/pay/order")
-//    @ApiOperation(value = "生成订单支付并返回短链接")
-//    public ResponseHelper<WebsitSalesPayMapBean> saveSheetPayMap(@RequestBody WebsitSalesPayMapBean sheetPayMap) throws RemoteServiceException {
-//        return ResponseHelper.success(websitSalesLogic.saveSheetPayMap(sheetPayMap));
-//    }
-//
-//    @ApiNotAuth
-//    @PostMapping("/pay")
-//    @ApiOperation(value = "生成支付")
-//    public ResponseHelper<PayDetail> websitDefault(
-//            @ApiParam(value = "appOrderId或payConfigId",required = true) @RequestParam String key,
-//            @ApiParam(value = "openid",required = true) @RequestParam String openid,
-//            @ApiParam(value = "salesId") @RequestParam(required = false) String salesId,
-//            @ApiParam(value = "通联支付类型") @RequestParam(required = false, defaultValue = SybConstants.PAY_TYPE_W06) String payType,
-//            @ApiParam(value = "支付完成跳转(必须为https协议地址，且不允许带参数)") @RequestParam(required = false) String frontUrl
-//    ) throws RemoteServiceException, InterruptedException {
-//        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + ":" + key);
-//        if(!obtain.tryLock(10, TimeUnit.SECONDS)){
-//            throw new RemoteServiceException("系统繁忙，请稍后再尝试");
-//        }
-//        try {
-//            PayDetail pay = websitSalesLogic.generatePayRecord(key, openid, salesId, payType, frontUrl);
-//            return ResponseHelper.success(pay);
-//        }finally {
-//            obtain.unlock();
-//        }
-//    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/NormRecordController.java

@@ -1,41 +0,0 @@
-package com.gree.mall.miniapp.controller.material;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.material.NormRecordVO;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.NormRecordLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-@Slf4j
-@RestController
-@Api(value = "使用记录API", tags ={"使用记录API"} )
-@RequestMapping(value = "/material/norm/record", produces = "application/json; charset=utf-8")
-public class NormRecordController {
-
-    @Resource
-    NormRecordLogic normRecordLogic;
-
-    @PostMapping("list")
-    @ApiOperation(value = "使用记录")
-    public ResponseHelper<IPage<NormRecordVO>> list(
-            @ApiParam(value = "单号") @RequestParam(required = false) String orderId,
-            @ApiParam(value = "类型 M=辅材 P=配件") @RequestParam(required = false) String goodsType,
-            @ApiParam(value = "月份 YYYY-mm") @RequestParam(required = false) String yearMonth,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) {
-        IPage<NormRecordVO> page = normRecordLogic.list(orderId, goodsType, yearMonth, pageNum, pageSize, request);
-        return ResponseHelper.success(page);
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/PartsRefundController.java

@@ -1,61 +0,0 @@
-package com.gree.mall.miniapp.controller.material;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.material.MyDataCountBean;
-import com.gree.mall.miniapp.bean.material.PartsRefundVO;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.PartsRefundLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-@Slf4j
-@RestController
-@Api(value = "配件返还API", tags ={"配件返还API"} )
-@RequestMapping(value = "/material/parts/refund", produces = "application/json; charset=utf-8")
-public class PartsRefundController {
-
-    @Resource
-    PartsRefundLogic partsRefundLogic;
-
-    @PostMapping("list")
-    @ApiOperation(value = "配件返还列表")
-    public ResponseHelper<IPage<PartsRefundVO>> list(
-            @ApiParam(value = "类型  NEW 新件返还  OLD 旧件返还 ", required = true) @RequestParam String type,
-            @ApiParam(value = "状态  SUBMIT=待返还 OK=已返还") @RequestParam(required = false) String status,
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize,
-            HttpServletRequest request
-    ) {
-        IPage<PartsRefundVO> page = partsRefundLogic.list(type, status, pageNum, pageSize, request);
-        return ResponseHelper.success(page);
-    }
-
-    @PostMapping("detail")
-    @ApiOperation(value = "配件返还详情")
-    public ResponseHelper<PartsRefundVO> detail(
-            @ApiParam(value = "单号") @RequestParam String partsRetId,
-            HttpServletRequest request
-    ) {
-        PartsRefundVO vo = partsRefundLogic.detail(partsRetId, request);
-        return ResponseHelper.success(vo);
-    }
-
-    @PostMapping("count")
-    @ApiOperation(value = "配件返还统计")
-    public ResponseHelper<MyDataCountBean> count(
-            @ApiParam(value = "类型  NEW 新件返还  OLD 旧件返还 ") @RequestParam String type,
-            HttpServletRequest request
-    ) {
-        MyDataCountBean bean = partsRefundLogic.count(type, request);
-        return ResponseHelper.success(bean);
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/WorkerStockController.java

@@ -1,87 +0,0 @@
-package com.gree.mall.miniapp.controller.material;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.material.MyDataCountBean;
-import com.gree.mall.miniapp.bean.material.stock.WorkerStockAccBean;
-import com.gree.mall.miniapp.bean.material.stock.WorkerStockBean;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.stock.MaterialGoodsStockLogic;
-import com.gree.mall.miniapp.plus.entity.WebsitGoodsCategory;
-import com.gree.mall.miniapp.plus.entity.WorkerStock;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "辅配件-我的库存", tags ={"辅配件-我的库存"} )
-@RequestMapping(value = "/material/worker/stock", produces = "application/json; charset=utf-8")
-public class WorkerStockController {
-
-    @Autowired
-    MaterialGoodsStockLogic materialGoodsStockLogic;
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "库存明细表头详情")
-    public ResponseHelper<WorkerStock> detail(
-            @RequestParam String id
-    ) throws RemoteServiceException {
-        WorkerStock detail = materialGoodsStockLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/category/list")
-    @ApiOperation(value = "我的库存分类")
-    public ResponseHelper<List<WebsitGoodsCategory>> categoryList(
-            @ApiParam(value = "网点id",required = false) @RequestParam(required = false) String websitId,
-            @ApiParam(value = "M=辅材 P=配件",required = true) @RequestParam String goodsType
-    ) throws RemoteServiceException {
-        List<WebsitGoodsCategory> categoryList = materialGoodsStockLogic.websitGoodsCategoryList(websitId, goodsType);
-        return ResponseHelper.success(categoryList);
-    }
-
-    @PostMapping("/list")
-    @ApiOperation(value = "我的库存列表")
-    public ResponseHelper<IPage<WorkerStockBean>> workerStockList(
-            @ApiParam(value = "网点id",required = false) @RequestParam(required = false) String websitId,
-            @ApiParam(value = "M=辅材 P=配件",required = true) @RequestParam String goodsType,
-            @ApiParam(value = "小类id",required = false) @RequestParam String categoryId,
-            @ApiParam(value = "页号",required = false) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = false) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        IPage<WorkerStockBean> workerStockBeanIPage = materialGoodsStockLogic.workerStockList(websitId, goodsType, categoryId, pageNum, pageSize);
-        return ResponseHelper.success(workerStockBeanIPage);
-    }
-
-
-    @PostMapping("/acc/list")
-    @ApiOperation(value = "我的库存明细列表")
-    public ResponseHelper<IPage<WorkerStockAccBean>> workerStockAccList(
-            @ApiParam(value = "网点id",required = false) @RequestParam(required = false) String websitId,
-            @ApiParam(value = "商品id",required = true) @RequestParam String websitGoodsId,
-            @ApiParam(value = "yyyy-MM格式",required = false) @RequestParam String month,
-            @ApiParam(value = "发生方向 ADD=增加 SUB=减少 ",required = false) @RequestParam(required = false) String directFlag,
-            @ApiParam(value = "页号",required = false) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = false) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        IPage<WorkerStockAccBean> workerStockAccIPage = materialGoodsStockLogic.workerStockAccList(websitId, websitGoodsId, month, directFlag,pageNum, pageSize);
-        return ResponseHelper.success(workerStockAccIPage);
-    }
-
-    @PostMapping("/my/data/count")
-    @ApiOperation(value = "我的数据统计")
-    public ResponseHelper<MyDataCountBean> myDataCount() throws RemoteServiceException {
-        MyDataCountBean bean = materialGoodsStockLogic.myDataCount();
-        return ResponseHelper.success(bean);
-    }
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/BuyController.java

@@ -1,49 +0,0 @@
-package com.gree.mall.miniapp.controller.material.parts;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.material.parts.WebsitExtends;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.parts.BuyLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@RestController
-@Api(value = "配件购买", tags ={"配件购买"} )
-@RequestMapping(value = "/app/buy", produces = "application/json; charset=utf-8")
-public class BuyController {
-
-    @Resource
-    BuyLogic buyLogic;
-
-    @ApiOperation(value = "当前默认销售网点")
-    @PostMapping("/websit/default")
-    public ResponseHelper<WebsitExtends> websitDefault(
-            @ApiParam(value = "所属网点编码",required = false) @RequestParam(required = false)  String websitId,
-            @ApiParam(value = "经度",required = true) @RequestParam(required = true) String longitude,
-            @ApiParam(value = "纬度",required = true) @RequestParam(required = true) String latitude
-    ) throws RemoteServiceException {
-        WebsitExtends shop = buyLogic.defaultWebsit(websitId, longitude, latitude);
-        return ResponseHelper.success(shop);
-    }
-
-
-    @ApiOperation(value = "附近的销售网点列表")
-    @PostMapping("/websit/list")
-    public ResponseHelper<IPage<WebsitExtends>> websitDefault(
-            @ApiParam(value = "所属网点编码") @RequestParam(required = false) String websitId,
-            @ApiParam(value = "经度",required = true) @RequestParam String longitude,
-            @ApiParam(value = "纬度",required = true) @RequestParam String latitude,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNo,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        IPage<WebsitExtends> fcShopExtendsIPage = buyLogic.queryWebsitList(websitId, longitude, latitude, pageNo, pageSize);
-        return ResponseHelper.success(fcShopExtendsIPage);
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/ChangeSalesController.java

@@ -1,48 +0,0 @@
-package com.gree.mall.miniapp.controller.material.parts;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.material.parts.PartsChangeSalesBean;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.parts.WebsitPartsChangeSalesLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@RestController
-@Api(value = "新件转销售", tags ={"新件转销售"} )
-@RequestMapping(value = "/app/worker/change-sales", produces = "application/json; charset=utf-8")
-public class ChangeSalesController {
-
-    @Resource
-    WebsitPartsChangeSalesLogic websitPartsChangeSalesLogic;
-
-    @ApiOperation(value = "新件转销售列表")
-    @PostMapping("/list")
-    public ResponseHelper<IPage<PartsChangeSalesBean>> appList(
-            @ApiParam(value = "转销单号") @RequestParam(required = false) String changeSalesNo,
-            @ApiParam(value = "单据状态 SUBMIT=提交 AGREE=通过 REJECT=驳回") @RequestParam(required = false) String flag,
-            @ApiParam(value = "师傅身份证", required = true) @RequestParam String identity,
-            @ApiParam(value = "配件编码") @RequestParam(required = false) String partsNumber,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNo,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsChangeSalesLogic.appList(changeSalesNo, flag, identity, pageNo, pageSize));
-    }
-
-    @ApiOperation(value = "新件转销售详情")
-    @PostMapping("/detail")
-    public ResponseHelper<PartsChangeSalesBean> detail(
-            @ApiParam(value = "转销单号",required = true) @RequestParam String changeSalesNo
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsChangeSalesLogic.detail(changeSalesNo));
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/NewRefundController.java

@@ -1,82 +0,0 @@
-package com.gree.mall.miniapp.controller.material.parts;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.inf.ValidGroup;
-import com.gree.mall.miniapp.bean.material.parts.NewRefundManageBean;
-import com.gree.mall.miniapp.bean.material.parts.NewRefundManageItemBean;
-import com.gree.mall.miniapp.constant.Constant;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.parts.NewRefundManageLogic;
-import com.gree.mall.miniapp.utils.ValidateUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.validation.ValidationException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "新件返还管理", tags ={"新件返还管理"} )
-@RequestMapping(value = "/app/worker/new-refund", produces = "application/json; charset=utf-8")
-public class NewRefundController {
-
-    @Resource
-    NewRefundManageLogic newRefundManageLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ApiOperation(value = "新件返还管理列表")
-    @PostMapping("/list")
-    public ResponseHelper<IPage<NewRefundManageBean>> appList(
-            @ApiParam(value = "申请单号") @RequestParam(required = false) String applyNo,
-            @ApiParam(value = "单据状态 SAVE=保存 SUBMIT=提交 AGREE=通过 REJECT=驳回 REFUNDED=已返还") @RequestParam(required = false) String flag,
-            @ApiParam(value = "师傅身份证", required = true) @RequestParam String identity,
-            @ApiParam(value = "配件编码") @RequestParam(required = false) String partsNumber,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNo,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(newRefundManageLogic.appList(applyNo, flag, identity, partsNumber, pageNo, pageSize));
-    }
-
-    @ApiOperation(value = "新件返还管理详情")
-    @PostMapping("/detail")
-    public ResponseHelper<NewRefundManageBean> detail(
-            @ApiParam(value = "申请单号",required = true) @RequestParam String applyNo
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(newRefundManageLogic.detail(applyNo));
-    }
-
-    @ApiOperation(value = "新件返还申请")
-    @PostMapping("/add")
-    public ResponseHelper add(
-            @RequestBody NewRefundManageBean newRefundManageBean
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + newRefundManageBean.getSalesId());
-        if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("销售单冻结中");
-        }
-        try {
-            // 校验
-            ValidateUtil.validate(newRefundManageBean, ValidGroup.Add.class);
-            for (NewRefundManageItemBean itemBean : newRefundManageBean.getNewRefundManageItemBeanList()) {
-                try {
-                    ValidateUtil.validate(itemBean, ValidGroup.Add.class);
-                } catch (ValidationException e) {
-                    throw new RemoteServiceException("“" +itemBean.getPartsName() + "”出错原因：" + e.getMessage());
-                }
-            }
-            newRefundManageLogic.add(newRefundManageBean);
-        } finally {
-            obtain.unlock();
-        }
-
-        return ResponseHelper.success();
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/OldRefundController.java

@@ -1,104 +0,0 @@
-package com.gree.mall.miniapp.controller.material.parts;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.material.parts.OldRefundManageBean;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.parts.OldRefundManageLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@Slf4j
-@RestController
-@Api(value = "旧件返还管理", tags = {"旧件返还管理"})
-@RequestMapping(value = "/app/worker/old-refund", produces = "application/json; charset=utf-8")
-public class OldRefundController {
-
-    @Resource
-    OldRefundManageLogic oldRefundManageLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-
-    @ApiOperation(value = "旧件返还管理列表")
-    @PostMapping("/list")
-    public ResponseHelper<IPage<OldRefundManageBean>> appList(
-            @ApiParam(value = "申请单号") @RequestParam(required = false) String applyNo,
-            @ApiParam(value = "维修标识 INNER=保内 OUTSIDE=保外") @RequestParam(required = false) String repairFlag,
-            @ApiParam(value = "单据状态 SAVE=保存 SUBMIT=提交 AGREE=通过 REJECT=驳回 REFUNDED=已返还") @RequestParam(required = false) String flag,
-            @ApiParam(value = "师傅身份证", required = true) @RequestParam String identity,
-            @ApiParam(value = "配件编码") @RequestParam(required = false) String partsNumber,
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNo,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(oldRefundManageLogic.appList(applyNo, repairFlag, flag, identity, partsNumber, pageNo, pageSize));
-    }
-
-    @ApiOperation(value = "旧件返还管理详情")
-    @PostMapping("/detail")
-    public ResponseHelper detail(
-            @ApiParam(value = "申请单号", required = true) @RequestParam String applyNo
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(oldRefundManageLogic.detail(applyNo));
-    }
-
-
-//    @ApiOperation(value = "PHP旧件返还申请")
-//    @PostMapping("/add")
-//    public ResponseHelper add(
-//            @RequestBody PHPOldRefundManageBean oldRefundManageBean
-//    ) throws Exception {
-//        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.NEW_REFUND + "add");
-//        try {
-//            if (obtain.tryLock(10, TimeUnit.SECONDS)) {
-//                // 校验
-//                ValidateUtil.validate(oldRefundManageBean, ValidGroup.Add.class);
-//                for (PHPOldRefundManageItemBean itemBean : oldRefundManageBean.getOldRefundManageItemBeanList()) {
-//                    try {
-//                        ValidateUtil.validate(itemBean, ValidGroup.Add.class);
-//                    } catch (ValidationException e) {
-//                        throw new RemoteServiceException("明细出错原因：" + e.getMessage());
-//                    }
-//                }
-//
-//                return ResponseHelper.success(oldRefundManageLogic.add(oldRefundManageBean));
-//            }
-//        } catch(Exception e) {
-//            log.error("【旧件返还提交处理】失败",e);
-//            throw e;
-//        } finally {
-//            obtain.unlock();
-//        }
-//        return ResponseHelper.error("");
-//    }
-
-//    @PostMapping("/add")
-//    @ApiOperation(value = "旧件返还申请")
-//    public ResponseHelper add(
-//            @RequestBody OldRefundManageBean oldRefundManageBean
-//    ) throws Exception {
-//        // 校验
-//        ValidateUtil.validate(oldRefundManageBean, ValidGroup.Add.class);
-//        for (OldRefundManageItemBean itemBean : oldRefundManageBean.getOldRefundManageItemBeanList()) {
-//            try {
-//                ValidateUtil.validate(itemBean, ValidGroup.Add.class);
-//            } catch (ValidationException e) {
-//                throw new RemoteServiceException("明细出错原因：" + e.getMessage());
-//            }
-//        }
-//
-//        return ResponseHelper.success(oldRefundManageLogic.add(oldRefundManageBean));
-//    }
-
-
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/SalesOrderController.java

@@ -1,134 +0,0 @@
-package com.gree.mall.miniapp.controller.material.parts;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.material.parts.PartsSalesOrderBean;
-import com.gree.mall.miniapp.constant.Constant;
-import com.gree.mall.miniapp.enums.material.BuyPeopleEnum;
-import com.gree.mall.miniapp.enums.material.PartsOrderStatusEnum;
-import com.gree.mall.miniapp.enums.material.PartsPushFlagEnum;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.parts.WebsitPartsSalesLogic;
-import com.gree.mall.miniapp.logic.material.parts.WebsitPartsSalesOrderLogic;
-import com.gree.mall.miniapp.plus.entity.AdminWebsit;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "配件销售订单", tags ={"配件销售订单"} )
-@RequestMapping(value = "/app/worker/parts-sales", produces = "application/json; charset=utf-8")
-public class SalesOrderController {
-
-    @Resource
-    WebsitPartsSalesLogic websitPartsSalesLogic;
-    @Resource
-    WebsitPartsSalesOrderLogic websitPartsSalesOrderLogic;
-    @Resource
-    RedisLockRegistry redisLockRegistry;
-
-    @ApiOperation(value = "查询师傅未转销售订单网点")
-    @PostMapping("/exist/websit/list")
-    public ResponseHelper<List<AdminWebsit>> existWebsitList (
-            @ApiParam(value = "师傅身份证",required = true) @RequestParam String identity,
-            @ApiParam(value = "网点编号") @RequestParam(required = false) String websitId
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsSalesLogic.existWebsitList(identity, websitId));
-    }
-
-
-    @ApiOperation(value = "销售订单列表")
-    @PostMapping("/list")
-    public ResponseHelper<IPage<PartsSalesOrderBean>> appList(
-            @ApiParam(value = "师傅身份证", required = true) @RequestParam String identity,
-            @ApiParam(value = "销售订单号") @RequestParam(required = false) String salesId,
-            @ApiParam(value = "单据状态 SAVE-保存未提交 SUBMIT-已提交 PAYED-已支付 END-已完成 CANCEL-已取消") @RequestParam(required = false) PartsOrderStatusEnum status,
-            @ApiParam(value = "下推标志 SALES=销售 TRANS=转销售 END=完结") @RequestParam(required = false) PartsPushFlagEnum pushFlag,
-            @ApiParam(value = "配件编码") @RequestParam(required = false) String partsNumber,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNo,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsSalesLogic.appList(identity, salesId, status, pushFlag, partsNumber, pageNo, pageSize));
-    }
-
-    @ApiOperation(value = "销售订单详情")
-    @PostMapping("/detail")
-    public ResponseHelper<IPage<PartsSalesOrderBean>> appDetail(
-            @ApiParam(value = "师傅身份证", required = true) @RequestParam String identity,
-            @ApiParam(value = "销售订单号", required = true) @RequestParam String salesId,
-            @ApiParam(value = "下推标志 SALES=销售 TRANS=转销售 END=完结") @RequestParam(required = false) String pushFlag
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsSalesLogic.appDetail(identity, salesId, pushFlag));
-    }
-
-
-
-    @ApiOperation("配件销售单新增")
-    @PostMapping("/add")
-    public ResponseHelper<PartsSalesOrderBean> add(
-            @RequestBody PartsSalesOrderBean partsSalesOrderBean
-    ) throws RemoteServiceException {
-        partsSalesOrderBean.setOrderSource("ONLINE");
-        partsSalesOrderBean.setBuyPeople(BuyPeopleEnum.WORKER.getKey());
-        partsSalesOrderBean.setIsApply(Boolean.FALSE);
-
-        websitPartsSalesOrderLogic.add(partsSalesOrderBean);
-        return ResponseHelper.success(partsSalesOrderBean);
-    }
-
-    @ApiOperation("配件销售单根据id获取")
-    @PostMapping("/loadSalesOrderById")
-    public ResponseHelper<PartsSalesOrderBean> loadSalesOrderById(
-            @RequestParam String id
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsSalesOrderLogic.loadSalesOrderById(id));
-    }
-
-    @ApiOperation("提交订单")
-    @PostMapping("/submit")
-    public ResponseHelper<PartsSalesOrderBean> submit(@ApiParam(value = "销售单id",required = true) @RequestParam String id) throws InterruptedException {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("销售单冻结中");
-        }
-        try {
-            return ResponseHelper.success(websitPartsSalesOrderLogic.submit(id));
-        } catch(Exception e) {
-            log.error("【提交订单处理】失败",e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-    }
-    
-    @ApiOperation("师傅提货")
-	@PostMapping("/workerConfirmDelivery")
-	public ResponseHelper workerConfirmDelivery(
-			@ApiParam(value = "销售单号",required = true) @RequestParam String id
-			) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
-        if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-            throw new RemoteServiceException("销售单冻结中");
-        }
-        try {
-            websitPartsSalesOrderLogic.workerConfirmDelivery(id);
-        } catch(Exception e) {
-            log.error("【师傅提货处理】失败",e);
-            throw e;
-        } finally {
-            obtain.unlock();
-        }
-
-		return ResponseHelper.success();
-	}
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/WebsitStockController.java

@@ -1,48 +0,0 @@
-package com.gree.mall.miniapp.controller.material.parts;
-
-import com.gree.mall.miniapp.bean.material.parts.WebsitPartsStockBean;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.parts.WebsitPartsStockLogic;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Slf4j
-@RestController()
-@Api(value = "网点配件库存查询", tags ={"网点配件库存查询"} )
-@RequestMapping(value = "/app/parts/websit/stock", produces = "application/json; charset=utf-8")
-public class WebsitStockController {
-
-    @Resource
-    WebsitPartsStockLogic websitPartsStockLogic;
-
-    @ApiOperation(value = "查询网点库存物料分组")
-    @PostMapping("/group/list")
-    public ResponseHelper<List<String>> websitGroupList (
-            @ApiParam(value = "网点编号",required = true) @RequestParam String websitId,
-            @ApiParam(value = "配件网点编号",required = true) @RequestParam String partsWebsitId
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsStockLogic.websitGroupList(websitId, partsWebsitId));
-    }
-
-    @ApiOperation(value = "查询网点库存")
-    @PostMapping("/list")
-    public ResponseHelper<List<WebsitPartsStockBean>> existWebsitStockList (
-            @ApiParam(value = "网点编号", required = true) @RequestParam String websitId,
-            @ApiParam(value = "配件网点编号", required = true) @RequestParam String partsWebsitId,
-            @ApiParam(value = "配件编码") @RequestParam(required = false) String partsNumber,
-            @ApiParam(value = "配件名称") @RequestParam(required = false) String partsName,
-            @ApiParam(value = "物料组名称") @RequestParam(required = false) String materialGroupName
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(websitPartsStockLogic.existWebsitStockList(websitId, partsWebsitId, partsNumber, partsName, materialGroupName));
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/WorkerPartsStockController.java

@@ -1,72 +0,0 @@
-package com.gree.mall.miniapp.controller.material.parts;
-
-import com.gree.mall.miniapp.bean.material.parts.PartsWorkerStockBean;
-import com.gree.mall.miniapp.bean.material.parts.WorkerStockCensusBean;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.parts.WorkerPartsStockLogic;
-import com.gree.mall.miniapp.plus.entity.AdminWebsit;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-@Slf4j
-@RestController()
-@Api(value = "配件库存查询", tags ={"配件库存查询"} )
-@RequestMapping(value = "/app/parts/stock", produces = "application/json; charset=utf-8")
-public class WorkerPartsStockController {
-
-    @Resource
-    WorkerPartsStockLogic workerPartsStockLogic;
-    
-    @ApiOperation(value = "查询师傅库存网点")
-    @PostMapping("/exist/websit/list")
-    public ResponseHelper<List<AdminWebsit>> existWebsitList (
-            @ApiParam(value = "师傅身份证",required = true) @RequestParam String identity
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(workerPartsStockLogic.existWebsitList(identity));
-    }
-
-    @ApiOperation(value = "查询师傅库存物料分组")
-    @PostMapping("/exist/websit/group/list")
-    public ResponseHelper<List<String>> existWebsitGroupList (
-            @ApiParam(value = "师傅身份证",required = true) @RequestParam String identity,
-            @ApiParam(value = "网点编号",required = true) @RequestParam String websitId,
-            @ApiParam(value = "配件网点编号",required = true) @RequestParam String partsWebsitId,
-            @ApiParam(value = "配件属性 NEW=新件 OLD=旧件 WAY=在途 TEMPNEW=临占新件 TEMPOLD=临占旧件",required = true) @RequestParam String partsAttr
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(workerPartsStockLogic.existWebsitGroupList(identity, websitId, partsWebsitId, partsAttr));
-    }
-   
-    @ApiOperation(value = "查询师傅库存")
-    @PostMapping("/exist/worker/stock/list")
-    public ResponseHelper<List<PartsWorkerStockBean>> existWorkerStockList (
-            @ApiParam(value = "师傅身份证",required = true) @RequestParam String identity,
-            @ApiParam(value = "网点编号",required = true) @RequestParam String websitId,
-            @ApiParam(value = "配件网点编号",required = true) @RequestParam String partsWebsitId,
-            @ApiParam(value = "配件属性 NEW=新件 OLD=旧件 WAY=在途 OLD=旧件 WAY=在途 TEMPNEW=临占新件 TEMPOLD=临占旧件",required = true) @RequestParam String partsAttr,
-            @ApiParam(value = "配件编码") @RequestParam(required = false) String partsNumber,
-            @ApiParam(value = "配件名称") @RequestParam(required = false) String partsName,
-            @ApiParam(value = "物料组") @RequestParam(required = false) String materialGroupName,
-            @ApiParam(value = "产品大类") @RequestParam(required = false) String productRelaId
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(workerPartsStockLogic.existWorkerStockList(identity, websitId, partsWebsitId, partsAttr, partsNumber, partsName, materialGroupName, productRelaId));
-    }
-    
-    @ApiOperation(value = "统计查询师傅库存相关")
-    @PostMapping("/query/worker-stock")
-    public ResponseHelper<WorkerStockCensusBean> queryWorkerStock (
-            @ApiParam(value = "师傅身份证",required = true) @RequestParam String identity,
-            @ApiParam(value = "网点编码") @RequestParam(required = false) String websitId
-    ) throws RemoteServiceException {
-        return ResponseHelper.success(workerPartsStockLogic.queryWorkerStock(identity, websitId));
-    }
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/withdrawal/WithdrawalController.java

@@ -1,82 +0,0 @@
-package com.gree.mall.miniapp.controller.material.withdrawal;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.gree.mall.miniapp.bean.material.settlement.SettlementAmountBean;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.withdrawal.WithdrawalLogic;
-import com.gree.mall.miniapp.plus.entity.WithdrawalOrder;
-import com.gree.mall.miniapp.plus.entity.WithdrawalOrderItem;
-import com.gree.mall.miniapp.plus.entity.WorkerBank;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@Slf4j
-@RestController
-@Api(value = "师傅提现API", tags ={"师傅提现API"} )
-@RequestMapping(value = "/withdrawal", produces = "application/json; charset=utf-8")
-public class WithdrawalController {
-
-    @Autowired
-    WithdrawalLogic withdrawalLogic;
-
-    @PostMapping("/save")
-    @ApiOperation(value = "申请提现")
-    public ResponseHelper save(
-           @ApiParam(value = "银行卡id",required = true) @RequestParam String workerBankId
-    ) throws RemoteServiceException {
-        withdrawalLogic.add(workerBankId);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "申请提现-详情")
-    public ResponseHelper<WithdrawalOrder> detail(
-            @ApiParam(value = "id",required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        WithdrawalOrder detail = withdrawalLogic.detail(id);
-        return ResponseHelper.success(detail);
-    }
-
-    @PostMapping("/amount/count")
-    @ApiOperation(value = "销售收益统计")
-    public ResponseHelper<SettlementAmountBean> totalAmount() throws RemoteServiceException {
-        SettlementAmountBean settlementAmountBean = withdrawalLogic.totalAmount();
-        return ResponseHelper.success(settlementAmountBean);
-    }
-
-
-    @PostMapping("/list")
-    @ApiOperation("提现订单")
-    public ResponseHelper<IPage<WithdrawalOrder>> list(
-            @RequestParam(required = false) String startTime,
-            @RequestParam(required = false) String endTime,
-            @RequestParam Integer pageNum,
-            @RequestParam Integer pageSize
-    ){
-        IPage<WithdrawalOrder> list = withdrawalLogic.list(startTime,endTime,pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/list/detail")
-    @ApiOperation("提现订单明细")
-    public ResponseHelper<IPage<WithdrawalOrderItem>> list(
-            @RequestParam String id,
-            @RequestParam Integer pageNum,
-            @RequestParam Integer pageSize
-    ){
-        IPage<WithdrawalOrderItem> list = withdrawalLogic.listDetail(id,pageNum, pageSize);
-        return ResponseHelper.success(list);
-    }
-
-
-
-
-
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/withdrawal/WorkerBankController.java

@@ -1,60 +0,0 @@
-package com.gree.mall.miniapp.controller.material.withdrawal;
-
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.material.withdrawal.WorkerBankLogic;
-import com.gree.mall.miniapp.plus.entity.WorkerBank;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-@Slf4j
-@RestController
-@Api(value = "师傅银行卡", tags ={"师傅银行卡"} )
-@RequestMapping(value = "/worker/bank", produces = "application/json; charset=utf-8")
-public class WorkerBankController {
-
-    @Autowired
-    WorkerBankLogic workerBankLogic;
-
-    @PostMapping("list")
-    @ApiOperation("银行卡-列表")
-    public ResponseHelper<List<WorkerBank>> list(){
-        List<WorkerBank> list = workerBankLogic.list();
-        return ResponseHelper.success(list);
-    }
-
-    @PostMapping("/save")
-    @ApiOperation(value = "银行卡-保存")
-    public ResponseHelper save(
-            @RequestBody WorkerBank workerBank
-    ) throws RemoteServiceException {
-        workerBankLogic.save(workerBank);
-        return ResponseHelper.success();
-    }
-
-    @PostMapping("/detail")
-    @ApiOperation(value = "银行卡-详情")
-    public ResponseHelper<WorkerBank> detail(
-            @ApiParam(value = "id",required = true) @RequestParam String id
-    ) throws RemoteServiceException {
-        WorkerBank workerBank = workerBankLogic.detail(id);
-        return ResponseHelper.success(workerBank);
-    }
-
-    @PostMapping("/delete")
-    @ApiOperation(value = "银行卡-删除")
-    public ResponseHelper delete(
-            @ApiParam(value = "id",required = true) @RequestParam String id
-    ){
-        workerBankLogic.delete(id);
-        return ResponseHelper.success();
-    }
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/order/OrderController.java

@@ -63,14 +63,14 @@ public class OrderController {
             HttpServletRequest request
     ) throws RemoteServiceException, InterruptedException {
         OrderAckBean orderAckBean = orderLogic.ackOrder(orderBuyBean,request);
-        try {
-            //运费
-            if(orderAckBean.getFreight().doubleValue() < 0){
-                return ResponseHelper.success(1100,orderAckBean,"暂不支持配送该地区");
-            }
-        }catch(Exception e){
-            return ResponseHelper.success(1100,orderAckBean,e.getMessage());
-        }
+//        try {
+//            //运费
+//            if(orderAckBean.getFreight().doubleValue() < 0){
+//                return ResponseHelper.success(1100,orderAckBean,"暂不支持配送该地区");
+//            }
+//        }catch(Exception e){
+//            return ResponseHelper.success(1100,orderAckBean,e.getMessage());
+//        }
         return ResponseHelper.success(orderAckBean);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/order/ShoppingCartController.java

@@ -6,7 +6,6 @@ import com.gree.mall.miniapp.bean.order.ShoppingCartList;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.helper.ResponseHelper;
 import com.gree.mall.miniapp.logic.order.ShoppingCartLogic;
-import com.gree.mall.miniapp.plus.entity.MiniNotice;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/pay/PayOrderController.java

@@ -1,198 +0,0 @@
-package com.gree.mall.miniapp.controller.pay;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.bean.order.OrderCount;
-import com.gree.mall.miniapp.bean.order.WorkerOrderBuy;
-import com.gree.mall.miniapp.bean.order.WorkerOrderDetail;
-import com.gree.mall.miniapp.constant.Constant;
-import com.gree.mall.miniapp.exception.RemoteServiceException;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.order.PayOrderLogic;
-import com.gree.mall.miniapp.plus.entity.*;
-import com.gree.mall.miniapp.utils.IpUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.integration.redis.util.RedisLockRegistry;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-
-@Slf4j
-@RestController
-@Api(value = "辅材配件销售", tags = {"辅材配件销售"})
-@RequestMapping(value = "/pay", produces = "application/json; charset=utf-8")
-public class PayOrderController {
-
-    @Resource
-    PayOrderLogic payOrderLogic;
-
-    @Autowired
-    RedisLockRegistry redisLockRegistry;
-
-
-    @PostMapping("/chargeList")
-    @ApiOperation(value = "辅材产品列表")
-    public ResponseHelper<Page<WebsitNormCharge>> pageCharge(
-            @ApiParam(required = false, value = "商品名称") @RequestParam(required = false) String name,
-            @ApiParam(required = false, value = "分类id") @RequestParam(required = false) String categoryId,
-            @ApiParam(required = false, value = "订单号") @RequestParam(required = false) String orderId,
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
-    ) throws Exception {
-        Page<WebsitNormCharge> websitNormChargePage = payOrderLogic.pageCharge(name, categoryId, orderId, pageNum, pageSize);
-        return ResponseHelper.success(websitNormChargePage);
-    }
-
-    @PostMapping("/orderPage")
-    @ApiOperation(value = "订单列表")
-    public ResponseHelper<Page<WorkerOrder>> orderPage(
-            @ApiParam(required = false, value = "商品类型 M=辅材 P=配件") @RequestParam(required = false) String goodsType,
-            @ApiParam(required = false, value = "订单号") @RequestParam(required = false) String orderId,
-            @ApiParam(required = false, value = "销售类型 OWN自有 OUT 外购") @RequestParam(required = false) String settlementType,
-            @ApiParam(required = false, value = "开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime,
-            @ApiParam(required = false, value = "年月") @RequestParam(required = false) String yearMonth,
-            @ApiParam(required = false, value = "支付状态CANEL 取消 WAIT 待支付 PAID 已支付") @RequestParam(required = false) String payStatus,
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
-    ) throws Exception {
-        Page<WorkerOrder> workerOrderVOPage = payOrderLogic.orderPage(yearMonth, settlementType, goodsType, orderId, startTime, endTime, payStatus, pageNum, pageSize);
-        return ResponseHelper.success(workerOrderVOPage);
-    }
-
-
-    @PostMapping("/orderCount")
-    @ApiOperation(value = "订单统计")
-    public ResponseHelper<OrderCount> orderCount(
-            @ApiParam(required = false, value = "商品类型 M=辅材 P=配件") @RequestParam(required = false) String goodsType,
-            @ApiParam(required = false, value = "订单号") @RequestParam(required = false) String orderId,
-            @ApiParam(required = false, value = "销售类型 OWN自有 OUT 外购") @RequestParam(required = false) String settlementType,
-            @ApiParam(required = false, value = "开始时间") @RequestParam(required = false) String startTime,
-            @ApiParam(required = false, value = "结束时间") @RequestParam(required = false) String endTime,
-            @ApiParam(required = false, value = "支付状态CANEL 取消 WAIT 待支付 PAID 已支付") @RequestParam(required = false) String payStatus
-
-    ) throws Exception {
-        OrderCount workerOrderVOPage = payOrderLogic.orderCount(settlementType, goodsType, orderId, startTime, endTime, payStatus);
-        return ResponseHelper.success(workerOrderVOPage);
-    }
-
-
-    @PostMapping("/buy")
-    @ApiOperation(value = "提交订单,返回订单号")
-    public ResponseHelper<String> buy(
-            @RequestBody WorkerOrderBuy workerOrderBuy,
-            HttpServletRequest request
-    ) throws Exception {
-        String ip = IpUtil.getIpAddr(request);
-        String workerOrderDetail = payOrderLogic.buy(workerOrderBuy, ip, request);
-        return ResponseHelper.success(workerOrderDetail);
-    }
-
-    @PostMapping("/getOrder")
-    @ApiOperation(value = "获得订单")
-    public ResponseHelper<WorkerOrderDetail> getOrder(
-            @ApiParam(required = false, value = "订单号") @RequestParam(required = false) String orderId
-
-    ) throws Exception {
-        WorkerOrderDetail workerOrderDetail = payOrderLogic.getOrder(orderId);
-        return ResponseHelper.success(workerOrderDetail);
-    }
-
-    @PostMapping("/cancel")
-    @ApiOperation(value = "取消订单")
-    public ResponseHelper cancel(
-            @ApiParam(required = true, value = "订单号") @RequestParam(required = true) String orderId
-
-    ) throws Exception {
-        payOrderLogic.cancel(orderId);
-        return ResponseHelper.success();
-    }
-
-
-    @PostMapping("/paid")
-    @ApiOperation(value = "扫码支付获得结果")
-    public ResponseHelper<Boolean> paid(
-            @ApiParam(required = true, value = "订单号") @RequestParam(required = true) String orderId,
-            @ApiParam(required = false, value = "扫付款码得到得code") @RequestParam(required = false) String authCode,
-            @ApiParam(required = true, value = "WECHAT 微信支付  LINE 线下支付") @RequestParam(required = true) String payType,
-            HttpServletRequest request
-    ) throws Exception {
-        Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.LOCK_ORDER + orderId);
-        try {
-            if (!obtain.tryLock(5, TimeUnit.SECONDS)) {
-                throw new RemoteServiceException("系统繁忙，请稍后再试");
-            }
-            String ip = IpUtil.getIpAddr(request);
-            Boolean payStatus = payOrderLogic.paid(orderId, authCode, ip, payType);
-            return ResponseHelper.success(payStatus);
-        } finally {
-            obtain.unlock();
-        }
-
-    }
-
-    @PostMapping("/websitGoodsList")
-    @ApiOperation(value = "配件列表")
-    public ResponseHelper<Page<WebsitGoods>> websitGoodsList(
-            @ApiParam(required = false, value = "商品名称") @RequestParam(required = false) String name,
-            @ApiParam(required = false, value = "服务大类") @RequestParam(required = false) String categoryName,
-            @ApiParam(required = false, value = "品牌") @RequestParam(required = false) String brand,
-            @ApiParam(required = false, value = "订单号") @RequestParam(required = false) String orderId,
-            @ApiParam(required = false, value = "收费类型 M=物料收费 S=服务收费") @RequestParam(required = false) String normType,
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
-    ) throws Exception {
-        Page<WebsitGoods> websitGoodsList = payOrderLogic.websitGoodsList(normType, brand, name, orderId, categoryName, pageNum, pageSize);
-        return ResponseHelper.success(websitGoodsList);
-    }
-
-
-    @PostMapping("/websitCategoryList")
-    @ApiOperation(value = "分类")
-    public ResponseHelper<Page<WebsitGoodsCategory>> websitCategoryList(
-
-            @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
-    ) throws Exception {
-        Page<WebsitGoodsCategory> websitGoodsList = payOrderLogic.websitCategoryList(pageNum, pageSize);
-        return ResponseHelper.success(websitGoodsList);
-    }
-
-
-    @PostMapping("/sysDict")
-    @ApiOperation(value = "获得字典值")
-    public ResponseHelper<List<SysDictCompany>> sysDict(
-            @ApiParam(required = true, value = "BRAND 品牌 ASSIST_UNIT辅材单位") @RequestParam(required = true) String dictType
-
-    ) throws Exception {
-        List<SysDictCompany> sysDictCompanyList = payOrderLogic.sysDict(dictType);
-        return ResponseHelper.success(sysDictCompanyList);
-    }
-
-    @PostMapping("/getBrand")
-    @ApiOperation(value = "获得品牌")
-    public ResponseHelper<List<Brand>> getBrand(
-
-    ) throws Exception {
-        List<Brand> brand = payOrderLogic.getBrand();
-        return ResponseHelper.success(brand);
-    }
-
-    @PostMapping("/getCategoryList")
-    @ApiOperation(value = "获得服务大类")
-    public ResponseHelper<List<GoodsCategory>> getCategoryList(
-
-    ) throws Exception {
-        List<GoodsCategory> sysDictCompanyList = payOrderLogic.getCategoryList();
-        return ResponseHelper.success(sysDictCompanyList);
-    }
-
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/seckill/SecKillController.java

@@ -1,77 +0,0 @@
-package com.gree.mall.miniapp.controller.seckill;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gree.mall.miniapp.annotation.ApiNotAuth;
-import com.gree.mall.miniapp.bean.PayDetail;
-import com.gree.mall.miniapp.bean.order.OrderBuyBean;
-import com.gree.mall.miniapp.bean.seckill.SecKillExtends;
-import com.gree.mall.miniapp.helper.ResponseHelper;
-import com.gree.mall.miniapp.logic.seckill.SecKillLogic;
-import com.gree.mall.miniapp.plus.entity.SecKillActivity;
-import com.gree.mall.miniapp.plus.entity.SecKillActivitySpec;
-import com.gree.mall.miniapp.utils.IpUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-@Slf4j
-@RestController
-@Api(value = "小程序秒杀", tags ={"小程序秒杀"} )
-@RequestMapping(value = "/goods/sec/", produces = "application/json; charset=utf-8")
-public class SecKillController {
-
-    @Autowired
-    private SecKillLogic secKillLogic;
-
-
-    @ApiNotAuth
-    @GetMapping("/time")
-    @ApiOperation(value = "秒杀时间段")
-    public ResponseHelper<List<SecKillExtends>> time(HttpServletRequest request) throws Exception{
-
-        List<SecKillExtends> secKillExtends = secKillLogic.queryTimeList(request);
-        return ResponseHelper.success(secKillExtends);
-    }
-
-
-    @ApiNotAuth
-    @GetMapping("/goods/list")
-    @ApiOperation(value = "秒杀商品列表")
-    public ResponseHelper<Page<SecKillActivitySpec>> page(
-            @ApiParam(value = "秒杀id",required = true) @RequestParam String secKillId,
-            @ApiParam(value = "页号",required = true) @RequestParam Integer pageNum,
-            @ApiParam(value = "页大小",required = true) @RequestParam Integer pageSize
-    ) throws Exception{
-
-        IPage<SecKillActivitySpec> page = secKillLogic.page(secKillId,pageNum,pageSize);
-        return ResponseHelper.success(page);
-    }
-
-
-    @PostMapping("/kill/start")
-    @ApiOperation(value = "秒杀开启,秒杀前先判断秒杀是否开启,开启:返回一个token,秒杀时需要带上,未开启,返回空字串")
-    public ResponseHelper<String> secKillStart(
-            @ApiParam(value = "秒杀id",required = true) @RequestParam String secKillId
-    ) throws Exception{
-        return ResponseHelper.success(secKillLogic.secKillStart(secKillId));
-    }
-
-
-//    @PostMapping("/buy")
-//    @ApiOperation("秒杀购买")
-//    public ResponseHelper buy(
-//            @RequestBody OrderBuyBean orderBuyBean,
-//            HttpServletRequest request
-//    ) throws Exception {
-//        String ip = IpUtil.getIpAddr(request);
-//        return ResponseHelper.success(secKillLogic.buy(orderBuyBean,ip));
-//    }
-
-}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/tag/TagController.java

@@ -1,52 +0,0 @@
-//package com.gree.mall.miniapp.controller.tag;
-//
-//import com.gree.mall.miniapp.bean.tag.WxCustomerTagBean;
-//import com.gree.mall.miniapp.exception.RemoteServiceException;
-//import com.gree.mall.miniapp.helper.ResponseHelper;
-//import com.gree.mall.miniapp.logic.tag.TagLogic;
-//import com.gree.mall.miniapp.plus.entity.Tag;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import io.swagger.annotations.ApiParam;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.*;
-//
-//import javax.servlet.http.HttpServletRequest;
-//
-//@Slf4j
-//@RestController
-//@Api(value = "标签", tags ={"标签"} )
-//@RequestMapping(value = "/tag", produces = "application/json; charset=utf-8")
-//public class TagController {
-//
-//    @Autowired
-//    private TagLogic tagLogic;
-//
-//
-//    @GetMapping("/wx/customer")
-//    @ApiOperation(value = "微信客户列表")
-//    public ResponseHelper wxCustomerList(HttpServletRequest request) throws RemoteServiceException {
-//        return ResponseHelper.success(tagLogic.wxCustomerList(request));
-//    }
-//
-//
-//
-//    @GetMapping("/wx/tag/list")
-//    @ApiOperation(value = "根据外部联系人unionId获取标签列表")
-//    public ResponseHelper wxTagList(HttpServletRequest request, @ApiParam(required = true, value = "用户id") @RequestParam(required = true) String unionId) throws RemoteServiceException {
-//        return ResponseHelper.success(tagLogic.tagList(request,unionId));
-//    }
-//
-//
-//    @PostMapping("/custom/edit")
-//    @ApiOperation("打标签")
-//    public ResponseHelper tagEdit(
-//            HttpServletRequest request,
-//            @ApiParam(value = "标签数据", required = true) @RequestBody WxCustomerTagBean wxCustomerTagBean) throws RemoteServiceException {
-//        tagLogic.edit(request,wxCustomerTagBean);
-//        return ResponseHelper.success();
-//    }
-//
-//
-//}

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -227,21 +227,6 @@ public class UserController {
         return ResponseHelper.success(user);
     }
 
-
-
-    @GetMapping("/apply/websit")
-    @ApiOperation("入驻的网点列表")
-    public ResponseHelper<List<AdminWebsitApplyBean>> applyWebsitList(
-            @ApiParam(value = "是否查询所有可入驻网点(包含未入驻的)",required = false) @RequestParam(required = false) Boolean isAll,
-            @ApiParam(value = "是否为增置服务网点",required = false) @RequestParam(required = false) Boolean isIncre,
-            @ApiParam(value = "增值服务ID",required = false) @RequestParam(required = false) String increId,
-            @ApiParam(value = "经度",required = false) @RequestParam(required = false) String lng,
-            @ApiParam(value = "纬度",required = false) @RequestParam(required = false) String lat
-    ){
-        List<AdminWebsitApplyBean> adminWebsitApplyBeans = userLogic.websitList(isAll,increId,isIncre,lng,lat);
-        return ResponseHelper.success(adminWebsitApplyBeans);
-    }
-
     @PostMapping("/default/websit")
     @ApiOperation(value = "设置默认网点")
     public ResponseHelper defaultWebsit(
@@ -251,15 +236,6 @@ public class UserController {
         return ResponseHelper.success();
     }
 
-    @PostMapping("/apply")
-    @ApiOperation(value = "师傅入驻和分销员入驻")
-    public ResponseHelper apply(
-            @RequestBody UserApplyBean userApplyBean
-    ){
-        userLogic.apply(userApplyBean);
-        return ResponseHelper.success();
-    }
-
     @GetMapping("/my/count")
     @ApiOperation(value = "我的相关统计")
     public ResponseHelper<MyCountBean> myCount(