首頁 探索 說明
註冊 登入
HJY
/
lineage
2
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

外部资讯分享页完善订单

xiaoshushu 4 年之前
父節點
3cc480e5ca
當前提交
6147862a8c
共有 5 個文件被更改，包括 1 次插入 和 23 次删除
統一視圖 顯示文件統計
  1. 1 14
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbNewsController.java
  2. 0 4
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/shop/TbOrdersController.java
  3. 0 2
      ruoyi-app/src/main/java/com/ruoyi/app/controller/shop/TbOrdersController.java
  4. 0 1
      ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
  5. 0 2
      ruoyi-system/src/main/resources/mapper/app/shop/TbOrdersMapper.xml

+ 1 - 14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbNewsController.java
查看文件 

@@ -70,19 +70,6 @@ public class TbNewsController extends BaseController {
 
     }
 
     }
 
 
 
     /**
 
     /**
 
-     * 外部获取资讯详细信息（用于app分享资讯）
 
-     */
 
-    @GetMapping(value = "/detail/{id}")
 
-    public AjaxResult detail(@PathVariable("id") Long id) {
 
-        TbNews news = iTbNewsService.getById(id);
 
-        if (news != null && news.getState() == 0) {
 
-            return AjaxResult.success(iTbNewsService.getById(id));
 
-        } else {
 
-            return AjaxResult.success();
 
-        }
 
-    }
 
-
 
-    /**
 
      * 新增资讯
 
      * 新增资讯
 
      */
 
      */
 
     @PreAuthorize("@ss.hasPermi('system:news:add')")
 
     @PreAuthorize("@ss.hasPermi('system:news:add')")
 
@@ -116,7 +103,7 @@ public class TbNewsController extends BaseController {
 
         return toAjax(iTbNewsService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
 
         return toAjax(iTbNewsService.removeByIds(Arrays.asList(ids)) ? 1 : 0);
 
     }
 
     }
 
 
 
-    //从html中提取纯文本作为摘要
 
+    //从html中提取纯文本
 
     private String StripHT(String strHtml) {
 
     private String StripHT(String strHtml) {
 
         String txtcontent = strHtml.replaceAll("</?[^>]+>", ""); //剔出<html>的标签
 
         String txtcontent = strHtml.replaceAll("</?[^>]+>", ""); //剔出<html>的标签
 
         txtcontent = txtcontent.replaceAll("<a>\\s*|\t|\r|\n</a>", "");//去除字符串中的空格,回车,换行符,制表符
 
         txtcontent = txtcontent.replaceAll("<a>\\s*|\t|\r|\n</a>", "");//去除字符串中的空格,回车,换行符,制表符

+ 0 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/shop/TbOrdersController.java
查看文件 

@@ -15,7 +15,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.bind.annotation.*;
 
 
 
 import java.util.Arrays;
 
 import java.util.Arrays;
 
-import java.util.Date;
 
 import java.util.List;
 
 import java.util.List;
 
 
 
 /**
 
 /**
 
@@ -68,9 +67,6 @@ public class TbOrdersController extends BaseController {
 
     @Log(title = "订单", businessType = BusinessType.UPDATE)
 
     @Log(title = "订单", businessType = BusinessType.UPDATE)
 
     @PutMapping
 
     @PutMapping
 
     public AjaxResult edit(@RequestBody TbOrders tbOrders) {
 
     public AjaxResult edit(@RequestBody TbOrders tbOrders) {
 
-        if (tbOrders.getState() == 2) {
 
-            tbOrders.setUpdateTime(new Date());
 
-        }
 
         return toAjax(iTbOrdersService.updateById(tbOrders) ? 1 : 0);
 
         return toAjax(iTbOrdersService.updateById(tbOrders) ? 1 : 0);
 
     }
 
     }

+ 0 - 2
ruoyi-app/src/main/java/com/ruoyi/app/controller/shop/TbOrdersController.java
查看文件 

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
 import org.springframework.web.bind.annotation.RestController;
 
 
 
-import java.util.Date;
 
 import java.util.List;
 
 import java.util.List;
 
 
 
 /**
 
 /**
 
@@ -60,7 +59,6 @@ public class TbOrdersController extends BaseController {
 
         TbOrders orders = service.getById(id);
 
         TbOrders orders = service.getById(id);
 
         if (orders != null && orders.getState() == 0) {
 
         if (orders != null && orders.getState() == 0) {
 
             orders.setState(-1);
 
             orders.setState(-1);
 
-            orders.setPayCancelTime(new Date());
 
             service.updateById(orders);
 
             service.updateById(orders);
 
             return AjaxResult.success(orders);
 
             return AjaxResult.success(orders);
 
         }
 
         }

+ 0 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
查看文件 

@@ -114,7 +114,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
 
                 .antMatchers("/*/api-docs").anonymous()
 
                 .antMatchers("/*/api-docs").anonymous()
 
                 .antMatchers("/druid/**").anonymous()
 
                 .antMatchers("/druid/**").anonymous()
 
                 .antMatchers("/template/**").anonymous()
 
                 .antMatchers("/template/**").anonymous()
 
-                .antMatchers("/system/news/detail/**").anonymous()
 
                 // 除上面外的所有请求全部需要鉴权认证
 
                 // 除上面外的所有请求全部需要鉴权认证
 
                 .anyRequest().authenticated()
 
                 .anyRequest().authenticated()
 
                 .and()
 
                 .and()

+ 0 - 2
ruoyi-system/src/main/resources/mapper/app/shop/TbOrdersMapper.xml
查看文件 

@@ -44,14 +44,12 @@
 
         <result property="id" column="app_user_id"/>
 
         <result property="id" column="app_user_id"/>
 
         <result property="nickName" column="nick_name"/>
 
         <result property="nickName" column="nick_name"/>
 
         <result property="mobile" column="mobile"/>
 
         <result property="mobile" column="mobile"/>
 
-        <result property="avatar"    column="avatar"    />
 
     </resultMap>
 
     </resultMap>
 
     <sql id="selectTbOrdersVo">
 
     <sql id="selectTbOrdersVo">
 
          SELECT
 
          SELECT
 
 	       o.*, u.avatar,
 
 	       o.*, u.avatar,
 
 	       u.nick_name,
 
 	       u.nick_name,
 
 	       u.mobile,
 
 	       u.mobile,
 
-	       u.avatar,
 
 	       g.pic,
 
 	       g.pic,
 
 	       g.price,
 
 	       g.price,
 
 	       g.id,
 
 	       g.id,