可抵扣数量

cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java

@@ -233,12 +233,7 @@ public class MyStpLogic {
      * @return 主店id
      */
     public Long getHeadShopId() {
-        Long shopId = getShopId(0L);
-        Long mainId = DbChain.table("tb_shop_config").select("main_id").where("id = ?", shopId).objAs(Long.class);
-        if (mainId != null) {
-            return mainId;
-        }
-        return shopId;
+        return getHeadShopId(getShopId(0L));
     }
 
     /**

cash-common/cash-common-service/src/main/java/com/czg/account/vo/UserCouponVo.java

@@ -26,6 +26,10 @@ public class UserCouponVo {
     private Integer type;
     //到期时间
     private Date endTime;
+    //可抵扣数量 商品券使用
+    private Integer discountNum;
+    private String useRule;
+    private String ruleDetails;
     private String useRestrictions;
     private boolean isUse = false;
     /**