添加平台优惠审核功能，添加查询平台优惠券功能，更新积分商城接口

src/main/java/com/sqx/modules/app/service/impl/UserMoneyDetailsServiceImpl.java

@@ -11,6 +11,12 @@ import com.sqx.common.utils.Result;
 import com.sqx.modules.app.dao.UserMoneyDetailsDao;
 import com.sqx.modules.app.entity.UserMoneyDetails;
 import com.sqx.modules.app.service.UserMoneyDetailsService;
+import com.sqx.modules.common.dao.CommonInfoDao;
+import com.sqx.modules.common.entity.CommonInfo;
+import com.sqx.modules.errand.entity.TbIndent;
+import com.sqx.modules.errand.entity.TbIndentSmsSendLog;
+import com.sqx.modules.errand.service.TbIndentService;
+import com.sqx.modules.errand.service.TbIndentSmsSendLogService;
 import com.sqx.modules.exportExecl.dto.AccountEntry;
 import com.sqx.modules.pay.controller.query.CashOutQueryDTO;
 import com.sqx.modules.pay.controller.query.WalletDetailQuery;

src/main/java/com/sqx/modules/coupon/controller/CouponController.java

@@ -79,4 +79,11 @@ public class CouponController extends AbstractController {
         return tbCouponService.checkCoupon(couponId, sysUserId, state);
     }
 
+
+    @ApiOperation("查看发布的优惠券")
+    @GetMapping(value = "selectAdminCoupon")
+        public Result selectAdminCoupon(Integer page, Integer limit,Integer state){
+        return tbCouponService.selectAdminCoupon(page, limit,state);
+    }
+
 }

src/main/java/com/sqx/modules/coupon/service/TbCouponService.java

@@ -26,4 +26,6 @@ public interface TbCouponService extends IService<TbCoupon> {
     TbCoupon selectCoupon(Long couponId);
 
     Result checkCoupon(Long couponId, Integer sysUserId, Integer state);
+
+    Result selectAdminCoupon(Integer page, Integer limit, Integer state);
 }

src/main/java/com/sqx/modules/coupon/service/impl/TbCouponServiceImpl.java

@@ -77,7 +77,7 @@ public class TbCouponServiceImpl extends ServiceImpl<TbCouponDao, TbCoupon> impl
     @Override
     public Result selectCouponList(Integer page, Integer limit,Long shopId) {
         Page<TbCoupon> pages = new Page<>(page, limit);
-        PageUtils pageUtils = new PageUtils(baseMapper.selectPage(pages, new QueryWrapper<TbCoupon>().eq(shopId!=null,"shop_id",shopId).eq("delete_flag", 0)));
+        PageUtils pageUtils = new PageUtils(baseMapper.selectPage(pages, new QueryWrapper<TbCoupon>().eq(shopId!=null,"shop_id",shopId).eq("delete_flag", 0).eq("state",1)));
         return Result.success().put("data", pageUtils);
     }
 
@@ -132,6 +132,24 @@ public class TbCouponServiceImpl extends ServiceImpl<TbCouponDao, TbCoupon> impl
     }
 
     @Override
+    public Result selectAdminCoupon(Integer page, Integer limit, Integer state) {
+        if(page == null || limit==null){
+            LambdaQueryWrapper<TbCoupon> wrapper=new LambdaQueryWrapper<>();
+            wrapper.eq(TbCoupon::getShopId,0)
+                    .eq(ObjectUtils.isNotEmpty(state),TbCoupon::getState,state);
+            List<TbCoupon> tbCoupons = baseMapper.selectList(wrapper);
+            return Result.success().put("data",tbCoupons);
+        }else{
+            Page<TbCoupon> pages = new Page<>(page, limit);
+            LambdaQueryWrapper<TbCoupon> wrapper=new LambdaQueryWrapper<>();
+            wrapper.eq(TbCoupon::getShopId,0)
+                    .eq(ObjectUtils.isNotEmpty(state),TbCoupon::getState,state);
+            PageUtils pageUtils = new PageUtils(baseMapper.selectPage(pages,wrapper));
+            return Result.success().put("data", pageUtils);
+        }
+    }
+
+    @Override
     public Result deleteCoupon(Long couponId) {
         tbCouponDao.deleteById(couponId);
         return Result.success();

src/main/java/com/sqx/scheduler/order/OrderScheduler.java

@@ -19,7 +19,9 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;