Merge branch 'master-chw-bug' of...

Merge branch 'master-chw-bug' of http://113.105.137.151:22280/youjj/cloud-platform into master-chw-bug

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/ArticleBiz.java

@@ -32,17 +32,17 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
     private final Integer HOME_PAGE_NUMBER = 4;
 
 
-
-
     /**
-     * 文章列表
-     *
+     * 资讯列表
      * @param page
      * @param limit
      * @param type
+     * @param title
+     * @param typeId
+     * @param flag 是否过滤未启用数据
      * @return
      */
-    public PageInfo getArticleList(Integer page, Integer limit, Integer type,String title, Integer typeId) {
+    public PageInfo getArticleList(Integer page, Integer limit, Integer type,String title, Integer typeId, boolean flag) {
         PageHelper.startPage(page, limit);
         Example example = new Example(Article.class);
         Example.Criteria criteria = example.createCriteria();
@@ -56,7 +56,9 @@ public class ArticleBiz extends BaseBiz<ArticleMapper, Article> {
             criteria.andEqualTo("typeId", typeId);
         }
         criteria.andEqualTo("isDel", 0);
-        criteria.andEqualTo("status", 1);
+       if (flag) {
+           criteria.andEqualTo("status", 1);
+       }
         example.orderBy("weight").asc();
         return PageInfo.of(mapper.selectByExample(example));
     }

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/ArticleController.java

@@ -28,7 +28,7 @@ public class ArticleController extends BaseController<ArticleBiz, Article> {
             @RequestParam(name = "type", defaultValue = "1") Integer type,
             @RequestParam(value = "title",required = false) String title,
             @RequestParam(value = "typeId",required = false) Integer typeId) {
-        return ObjectRestResponse.succ(baseBiz.getArticleList(page, limit, type,title, typeId));
+        return ObjectRestResponse.succ(baseBiz.getArticleList(page, limit, type,title, typeId, true));
     }
 
     @GetMapping("/app/unauth/one")

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/admin/ArticleAdminController.java

+package com.xxfc.platform.uccn.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.uccn.biz.ArticleBiz;
+import com.xxfc.platform.uccn.entity.Article;
+import com.xxfc.platform.uccn.vo.ArticleQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * 文章
+ *
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/article/admin")
+@Api(tags = {"文章"})
+public class ArticleAdminController extends BaseController<ArticleBiz, Article> {
+
+    @GetMapping("list")
+    @ApiOperation(value = "获取文章列表")
+    public ObjectRestResponse getArticleList(
+            @RequestParam(name = "page", defaultValue = "1") Integer page,
+            @RequestParam(name = "limit", defaultValue = "10") Integer limit,
+            @RequestParam(name = "type", defaultValue = "1") Integer type,
+            @RequestParam(value = "title",required = false) String title,
+            @RequestParam(value = "typeId",required = false) Integer typeId) {
+        return ObjectRestResponse.succ(baseBiz.getArticleList(page, limit, type,title, typeId, false));
+    }
+
+    @GetMapping("/app/unauth/one")
+    @ApiOperation(value = "获取一条数据")
+    public ObjectRestResponse getOne(@RequestParam Integer id,
+                                     @RequestParam(required = false) Integer urlType) {
+       return ObjectRestResponse.succ(baseBiz.getOne(id,urlType));
+    }
+
+    /**
+     * 随机获取三条数据
+     * @param type
+     * @param number
+     * @param id
+     * @return
+     */
+    @GetMapping("/app/unauth/three")
+    @ApiOperation(value = "随机获取三条数据")
+    public ObjectRestResponse randomAccessToThreeData(@RequestParam("type") Integer type,
+                                                      @RequestParam("number") Integer number,
+                                                      @RequestParam("id") Integer id
+                                                      ){
+        return ObjectRestResponse.succ(baseBiz.getThree(type,number,id));
+    }
+
+    @GetMapping("/app/unauth/homePage/{type}")
+    @ApiOperation(value = "获取首页文章列表")
+    public ObjectRestResponse getHomePageArticle(@PathVariable Integer type
+             ,@RequestParam(value = "limit",defaultValue = "9") Integer limit){
+        return ObjectRestResponse.succ(baseBiz.getHomePageArticle(type,limit));
+    }
+
+    @Override
+    @PostMapping("/add")
+    @ApiOperation(value = "添加")
+    public ObjectRestResponse add(@RequestBody Article article){
+        baseBiz.add(article);
+        return ObjectRestResponse.succ();
+    }
+
+
+    @PostMapping("/all")
+    @ApiOperation(value = "获取新闻列表")
+    public ObjectRestResponse<Article> findAll(@RequestBody ArticleQuery query){
+        return ObjectRestResponse.succ(baseBiz.findAll(query));
+    }
+
+    @Override
+    @PutMapping("/update")
+    @ApiOperation(value = "修改")
+    public ObjectRestResponse update(@RequestBody Article article){
+        int flag = baseBiz.updateSelectiveByIdRe(article);
+        if (flag==1) {
+            return ObjectRestResponse.succ();
+        }
+       return ObjectRestResponse.createDefaultFail();
+    }
+
+    @PutMapping("/putaway/{id}")
+    @ApiOperation(value = "上架")
+    public ObjectRestResponse  putaway(@PathVariable Integer id){
+        int flag = baseBiz.putaway(id);
+        if (flag==1) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
+
+    @PutMapping("/soldOut/{id}")
+    @ApiOperation(value = "下架")
+    public ObjectRestResponse soldOut(@PathVariable Integer id){
+        int flag = baseBiz.soldOut(id);
+        if (flag==1) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
+
+    @PutMapping("/remove/{id}")
+    @ApiOperation(value = "删除")
+    public ObjectRestResponse remove(@PathVariable Integer id){
+        int flag = baseBiz.remove(id);
+        if (flag==1) {
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
+
+}

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -272,7 +272,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
         AlipayClient alipayClient = getAlipayClient();
         //实例化具体API对应的request类,类名称和接口名称对应,当前调用接口名称：alipay.trade.app.pay
         try {
-            return appOrderPay(alipayClient, orderPayVo, notifyUrl);
+            return fundAuthOrderAppFreeze(alipayClient, orderPayVo, notifyUrl);
         } catch (Exception e) {
             log.error(e.getMessage(), e);;
         }