Merge remote-tracking branch 'origin/test' into test

cash-common/cash-common-redis/src/main/java/com/czg/config/RedisCst.java

@@ -25,6 +25,8 @@ public interface RedisCst {
         public static final String EXPIRED_COUPON = "expired:coupon:";
         //拼团 任务过期
         public static final String EXPIRED_GB_ORDER = "expired:gb:order:";
+        // 套餐推广 任务过期
+        public static final String EXPIRED_PP_ORDER = "expired:pp:order:";
         //短信定时发放 倒计时KEY
         public static final String EXPIRED_SMS = "expired:sms:";
         //公众号推送 倒计时KEY

cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageOrderService.java

@@ -70,4 +70,9 @@ public interface PpPackageOrderService extends IService<PpPackageOrder> {
      * 核销
      */
     boolean checkout(String verifyCode, Long shopId);
+
+    /**
+     * 过期订单
+     */
+    void expiredOrder(Long orderId);
 }

cash-common/cash-common-service/src/main/java/com/czg/market/service/PpPackageService.java

@@ -48,5 +48,8 @@ public interface PpPackageService extends IService<PpPackage> {
 
     PpPackage getPackageById(Long id);
 
+    PpPackageVO getPackageDetail(Long id);
+
     PpPackageVO convertPackageToVo(PpPackage ppPackage);
+
 }

cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpPackageVO.java

@@ -182,4 +182,19 @@ public class PpPackageVO {
      * 已售数量
      */
     private Integer saleNum;
+
+    /**
+     * 店铺名称
+     */
+    private String shopName;
+
+    /**
+     * 店铺logo
+     */
+    private String shopLogo;
+
+    /**
+     * 店铺地址
+     */
+    private String shopAddress;
 }