admin启动忽略延迟任务service

admin订单列表新增优惠信息

admin/src/main/java/com/kym/admin/AdminApplication.java

@@ -12,8 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
 @EnableScheduling
-@SpringBootApplication()
-@ComponentScan(value = {"com.kym"}, excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE))
+@SpringBootApplication
+@ComponentScan(value = {"com.kym"}, excludeFilters = {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE)
+        , @ComponentScan.Filter(type = FilterType.REGEX, pattern = {"com.kym.service.miniapp.impl.DelayServiceImpl"})})
 @MapperScan(basePackages = {"com.kym.mapper"})
 public class AdminApplication {
 

admin/src/main/java/com/kym/admin/controller/BannerController.java

@@ -33,12 +33,12 @@ public class BannerController {
 
     @SysLog("修改Banner")
     @PutMapping
-    R<?> updateBanner(@RequestBody Banner banner){
+    R<?> updateBanner(@RequestBody Banner banner) {
         return R.success(bannerService.updateBanner(banner));
     }
 
     @SysLog("Banner列表")
-    @PostMapping
+    @GetMapping
     R<?> listBanner(@RequestBody BannerQueryParam params) {
         return R.success(bannerService.listBanner(params));
     }

admin/src/main/java/com/kym/admin/controller/CustomController.java

@@ -34,13 +34,13 @@ public class CustomController {
     @SaCheckPermission("account.list")
     @SysLog("查询用户列表")
     @GetMapping("/listUser")
-    public R listUser(@ModelAttribute CommonQueryParam params) {
+    public R<?> listUser(@ModelAttribute CommonQueryParam params) {
         return R.success(customUserService.listCustomUser(params));
     }
 
     @SysLog("查询用户充电订单列表")
     @GetMapping("/listChargeOrders")
-    public R listChargeOrders(@ModelAttribute CustomChargeOrdersQueryParam params) {
+    public R<?> listChargeOrders(@ModelAttribute CustomChargeOrdersQueryParam params) {
         return R.success(customChargeOrders.customChargeOrders(params));
     }
 
@@ -50,15 +50,9 @@ public class CustomController {
         customChargeOrders.exportCustomChargeOrders(params, response);
     }
 
-    @SysLog("订单详情")
-    @GetMapping("/orderDetail/{startChargeSeq}")
-    public R orderDetail(@PathVariable("startChargeSeq") String startChargeSeq) {
-        return R.success(customChargeOrders.orderDetail(startChargeSeq));
-    }
-
     @SysLog("充值记录列表")
     @GetMapping("/listRecharge")
-    public R listRecharge(@ModelAttribute CommonQueryParam params) {
+    public R<?> listRecharge(@ModelAttribute CommonQueryParam params) {
         return R.success(payLogService.listRecharge(params));
     }
 

entity/src/main/java/com/kym/entity/admin/vo/CustomOrderVo.java

@@ -29,8 +29,12 @@ public class CustomOrderVo {
     private Integer totalMoney;
     private Integer elecMoney;
     private Integer serviceMoney;
+    private Integer payAmount;
+    private Integer discountAmount;
+    private Integer serviceMoneyDiscount;
     private Integer orderStatus;
     private Integer chargeStatus;
     private Integer stopReason;
     private Integer invoiceStatus;
+    private Integer invoiceId;
 }

mapper/src/main/resources/mappers/miniapp/ChargeOrderMapper.xml

@@ -39,10 +39,14 @@
         <result column="total_money" property="totalMoney"/>
         <result column="elec_money" property="elecMoney"/>
         <result column="service_money" property="serviceMoney"/>
+        <result column="pay_amount" property="payAmount"/>
+        <result column="discount_amount" property="discountAmount"/>
+        <result column="service_money_discount" property="serviceMoneyDiscount"/>
         <result column="order_status" property="orderStatus"/>
         <result column="charge_status" property="chargeStatus"/>
         <result column="stop_reason" property="stopReason"/>
         <result column="invoice_status" property="invoiceStatus"/>
+        <result column="invoice_id" property="invoiceId"/>
     </resultMap>
 
     <resultMap id="StationStatMap" type="com.kym.entity.admin.vo.StationStatVo">
@@ -57,7 +61,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, station_id, start_charge_seq, connector_id, start_time, end_time, soc, total_power, total_money, elec_money, service_money, sum_period, charge_detail, order_status, charge_status, stop_reason, invoice_status,invoice_id,create_time, update_time
+        id, user_id, station_id, start_charge_seq, connector_id, start_time, end_time, soc, total_power, total_money, elec_money, service_money,pay_amount,discount_amount,service_money_discount, sum_period, charge_detail, order_status, charge_status, stop_reason, invoice_status,invoice_id,create_time, update_time
     </sql>
 
     <select id="statChargeOrders" resultType="java.util.Map"
@@ -114,6 +118,9 @@
         t1.total_money,
         t1.elec_money,
         t1.service_money,
+        t1.pay_amount,
+        t1.discount_amount,
+        t1.service_money_discount,
         t1.order_status,
         t1.charge_status,
         t1.invoice_status,