Merge branch 'lyf' of https://e.coding.net/g-cphe0354/shouyinjixitong/wx-cashier-service into lyf

# Conflicts:
#	src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
#	src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java

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

@@ -101,6 +101,29 @@ public class TbOrderInfo implements Serializable {
     private List<TbOrderDetail> detailList;
     private String winnnerNo;
     private String isWinner;
+
+
+    //根据状态返回 需付款 已付款 未付款 已退
+    private String description;
+
+    public void setDescription() {
+        switch (status) {
+            case "closed":
+                this.description = "已付款";
+                break;
+            case "refund":
+                this.description = "已退款";
+                break;
+            case "paying":
+            case "unpaid":
+                this.description = "需付款";
+                break;
+            default:
+                this.description = "";
+                break;
+        }
+    }
+
     private String outNumber;
     private static final long serialVersionUID = 1L;
     public TbOrderInfo(){

src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/HomeDto.java

@@ -29,4 +29,9 @@ public class HomeDto extends HomeBaseDto {
      */
     private Integer dateType = 1;
 
+    public void setOrderBy(Integer orderBy) {
+        if(orderBy!=null){
+            this.orderBy = orderBy;
+        }
+    }
 }

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

@@ -24,6 +24,8 @@ public class OrderVo {
     private String orderNo;
 
     private Long time;
+    private Long expiredMinutes = 0l;
+    private Long expiredSeconds = 0l;
 
     private BigDecimal payAmount;
     private String orderType;

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

@@ -0,0 +1,20 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ShopUserListVo {
+
+    private Long memberId;
+    private Long shopId;
+    private String shopName;
+    private String chainName;
+    private String logo;
+    private String detail;
+    private BigDecimal levelConsume;
+    private BigDecimal amount;
+    private String code;
+    private Integer isVip;
+}