优惠券+异常全局处理

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java

@@ -1,8 +1,12 @@
 package com.chaozhanggui.system.cashierservice.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
+
+@Data
 public class TbShopInfo implements Serializable {
     private Integer id;
 
@@ -95,366 +99,5 @@ public class TbShopInfo implements Serializable {
      * 商家二维码
      */
     private String shopQrcode;
-
-    public String getShopQrcode() {
-        return shopQrcode;
-    }
-
-    public void setShopQrcode(String shopQrcode) {
-        this.shopQrcode = shopQrcode;
-    }
-
-    private static final long serialVersionUID = 1L;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account == null ? null : account.trim();
-    }
-
-    public String getShopCode() {
-        return shopCode;
-    }
-
-    public void setShopCode(String shopCode) {
-        this.shopCode = shopCode == null ? null : shopCode.trim();
-    }
-
-    public String getSubTitle() {
-        return subTitle;
-    }
-
-    public void setSubTitle(String subTitle) {
-        this.subTitle = subTitle == null ? null : subTitle.trim();
-    }
-
-    public String getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(String merchantId) {
-        this.merchantId = merchantId == null ? null : merchantId.trim();
-    }
-
-    public String getShopName() {
-        return shopName;
-    }
-
-    public void setShopName(String shopName) {
-        this.shopName = shopName == null ? null : shopName.trim();
-    }
-
-    public String getChainName() {
-        return chainName;
-    }
-
-    public void setChainName(String chainName) {
-        this.chainName = chainName == null ? null : chainName.trim();
-    }
-
-    public String getBackImg() {
-        return backImg;
-    }
-
-    public void setBackImg(String backImg) {
-        this.backImg = backImg == null ? null : backImg.trim();
-    }
-
-    public String getFrontImg() {
-        return frontImg;
-    }
-
-    public void setFrontImg(String frontImg) {
-        this.frontImg = frontImg == null ? null : frontImg.trim();
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName == null ? null : contactName.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo == null ? null : logo.trim();
-    }
-
-    public Byte getIsDeposit() {
-        return isDeposit;
-    }
-
-    public void setIsDeposit(Byte isDeposit) {
-        this.isDeposit = isDeposit;
-    }
-
-    public Byte getIsSupply() {
-        return isSupply;
-    }
-
-    public void setIsSupply(Byte isSupply) {
-        this.isSupply = isSupply;
-    }
-
-    public String getCoverImg() {
-        return coverImg;
-    }
-
-    public void setCoverImg(String coverImg) {
-        this.coverImg = coverImg == null ? null : coverImg.trim();
-    }
-
-    public String getShareImg() {
-        return shareImg;
-    }
-
-    public void setShareImg(String shareImg) {
-        this.shareImg = shareImg == null ? null : shareImg.trim();
-    }
-
-    public String getDetail() {
-        return detail;
-    }
-
-    public void setDetail(String detail) {
-        this.detail = detail == null ? null : detail.trim();
-    }
-
-    public String getLat() {
-        return lat;
-    }
-
-    public void setLat(String lat) {
-        this.lat = lat == null ? null : lat.trim();
-    }
-
-    public String getLng() {
-        return lng;
-    }
-
-    public void setLng(String lng) {
-        this.lng = lng == null ? null : lng.trim();
-    }
-
-    public String getMchId() {
-        return mchId;
-    }
-
-    public void setMchId(String mchId) {
-        this.mchId = mchId == null ? null : mchId.trim();
-    }
-
-    public String getRegisterType() {
-        return registerType;
-    }
-
-    public void setRegisterType(String registerType) {
-        this.registerType = registerType == null ? null : registerType.trim();
-    }
-
-    public Byte getIsWxMaIndependent() {
-        return isWxMaIndependent;
-    }
-
-    public void setIsWxMaIndependent(Byte isWxMaIndependent) {
-        this.isWxMaIndependent = isWxMaIndependent;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address == null ? null : address.trim();
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city == null ? null : city.trim();
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type == null ? null : type.trim();
-    }
-
-    public String getIndustry() {
-        return industry;
-    }
-
-    public void setIndustry(String industry) {
-        this.industry = industry == null ? null : industry.trim();
-    }
-
-    public String getIndustryName() {
-        return industryName;
-    }
-
-    public void setIndustryName(String industryName) {
-        this.industryName = industryName == null ? null : industryName.trim();
-    }
-
-    public String getBusinessTime() {
-        return businessTime;
-    }
-
-    public void setBusinessTime(String businessTime) {
-        this.businessTime = businessTime == null ? null : businessTime.trim();
-    }
-
-    public String getPostTime() {
-        return postTime;
-    }
-
-    public void setPostTime(String postTime) {
-        this.postTime = postTime == null ? null : postTime.trim();
-    }
-
-    public BigDecimal getPostAmountLine() {
-        return postAmountLine;
-    }
-
-    public void setPostAmountLine(BigDecimal postAmountLine) {
-        this.postAmountLine = postAmountLine;
-    }
-
-    public Byte getOnSale() {
-        return onSale;
-    }
-
-    public void setOnSale(Byte onSale) {
-        this.onSale = onSale;
-    }
-
-    public Byte getSettleType() {
-        return settleType;
-    }
-
-    public void setSettleType(Byte settleType) {
-        this.settleType = settleType;
-    }
-
-    public String getSettleTime() {
-        return settleTime;
-    }
-
-    public void setSettleTime(String settleTime) {
-        this.settleTime = settleTime == null ? null : settleTime.trim();
-    }
-
-    public Integer getEnterAt() {
-        return enterAt;
-    }
-
-    public void setEnterAt(Integer enterAt) {
-        this.enterAt = enterAt;
-    }
-
-    public Long getExpireAt() {
-        return expireAt;
-    }
-
-    public void setExpireAt(Long expireAt) {
-        this.expireAt = expireAt;
-    }
-
-    public Byte getStatus() {
-        return status;
-    }
-
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    public Float getAverage() {
-        return average;
-    }
-
-    public void setAverage(Float average) {
-        this.average = average;
-    }
-
-    public Integer getOrderWaitPayMinute() {
-        return orderWaitPayMinute;
-    }
-
-    public void setOrderWaitPayMinute(Integer orderWaitPayMinute) {
-        this.orderWaitPayMinute = orderWaitPayMinute;
-    }
-
-    public Integer getSupportDeviceNumber() {
-        return supportDeviceNumber;
-    }
-
-    public void setSupportDeviceNumber(Integer supportDeviceNumber) {
-        this.supportDeviceNumber = supportDeviceNumber;
-    }
-
-    public Byte getDistributeLevel() {
-        return distributeLevel;
-    }
-
-    public void setDistributeLevel(Byte distributeLevel) {
-        this.distributeLevel = distributeLevel;
-    }
-
-    public Long getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Long createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Long getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Long updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-
-    public String getProxyId() {
-        return proxyId;
-    }
-
-    public void setProxyId(String proxyId) {
-        this.proxyId = proxyId == null ? null : proxyId.trim();
-    }
-
-    public String getView() {
-        return view;
-    }
-
-    public void setView(String view) {
-        this.view = view == null ? null : view.trim();
-    }
+    private String isOpenYhq;
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbSystemCoupons.java

@@ -17,6 +17,7 @@ public class TbSystemCoupons implements Serializable {
     private BigDecimal couponsAmount;
 
     private String status;
+    private String typeName;
 
     private Date createTime;
 

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbWiningParams.java

@@ -0,0 +1,22 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class TbWiningParams implements Serializable {
+    private Integer id;
+
+    private BigDecimal minPrice;
+
+    private BigDecimal maxPrice;
+
+    private Integer winingNum;
+
+    private Integer winingUserNum;
+    private String status;
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbWiningUser.java

@@ -17,9 +17,38 @@ public class TbWiningUser implements Serializable {
     private BigDecimal orderAmount;
 
     private String isUser;
-    private String tradeDay;
 
     private Date createTime;
 
+    private String isRefund;
+
+    private BigDecimal refundAmount;
+
+    private String refundNo;
+
+    private String refundPayType;
+
+    private String tradeDay;
+
+    private Date refundTime;
+
+
     private static final long serialVersionUID = 1L;
+    public TbWiningUser(){
+        super();
+    }
+    public TbWiningUser(String userName,String orderNo,BigDecimal orderAmount,
+                        String isUser,String tradeDay){
+        this.createTime = new Date();
+        this.userName = userName;
+        this.orderNo = orderNo;
+        this.orderAmount = orderAmount;
+        this.isUser = isUser;
+        this.tradeDay = tradeDay;
+        this.isRefund = "false";
+        this.refundAmount = BigDecimal.ZERO;
+        this.refundPayType = "WX";
+
+
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbYhqParams.java

@@ -0,0 +1,58 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class TbYhqParams implements Serializable {
+    private Integer id;
+
+    private String name;
+
+    private BigDecimal minPrice;
+
+    private BigDecimal maxPrice;
+
+    private String status;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public BigDecimal getMinPrice() {
+        return minPrice;
+    }
+
+    public void setMinPrice(BigDecimal minPrice) {
+        this.minPrice = minPrice;
+    }
+
+    public BigDecimal getMaxPrice() {
+        return maxPrice;
+    }
+
+    public void setMaxPrice(BigDecimal maxPrice) {
+        this.maxPrice = maxPrice;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/IntegralFlowVo.java

@@ -0,0 +1,17 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author lyf
+ */
+@Data
+public class IntegralFlowVo {
+    private String openId;
+    private Integer page;
+    private Integer pageSize;
+    private String sign;
+
+}