Browse Source

创客付款单

LiFei 3 năm trước cách đây
mục cha
commit
a780983527

+ 24 - 0
happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hlwinvoice/controller/HlwInvoiceController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.hlwinvoice.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -9,6 +10,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.LimitSubmit;
 import org.jeecg.common.aspect.annotation.PermissionData;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.hlwinvoice.entity.HlwInvoice;
 import org.jeecg.modules.hlwinvoice.service.IHlwInvoiceService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,4 +83,26 @@ public class HlwInvoiceController {
         hlwInvoiceService.saveHlwInvoice(hlwInvoice);
         return Result.ok("添加成功!");
     }
+
+
+    /**
+     * 分页列表查询(创客付款单)
+     *
+     * @param hlwInvoice
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "-分页列表查询")
+    @ApiOperation(value="-分页列表查询", notes="-分页列表查询")
+    @GetMapping(value = "/detailList")
+    public Result<?> detailList(HlwInvoice hlwInvoice,
+                                @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                HttpServletRequest req) {
+        Page<?> pageList = hlwInvoiceService.detailList(pageNo, pageSize,hlwInvoice,req);
+        return Result.ok(pageList);
+    }
+
 }

+ 3 - 0
happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hlwinvoice/entity/HlwInvoice.java

@@ -153,4 +153,7 @@ public class HlwInvoice implements Serializable {
     @TableField(exist = false)
     private Integer invoiceCategoryId;
 
+    @TableField(exist = false)
+    private Integer paymentId;
+
 }

+ 3 - 0
happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hlwinvoice/service/IHlwInvoiceService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.hlwinvoice.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.api.vo.Result;
@@ -21,4 +22,6 @@ public interface IHlwInvoiceService extends IService<HlwInvoice> {
     Result<?> invoicePayment(HlwInvoice hlwInvoice, HttpServletRequest request);
 
     void saveHlwInvoice(HlwInvoice hlwInvoice);
+
+    Page<?> detailList(Integer pageNo, Integer pageSize, HlwInvoice hlwInvoice, HttpServletRequest req);
 }

+ 40 - 0
happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hlwinvoice/service/impl/HlwInvoiceServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.hlwinvoice.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -74,6 +75,45 @@ public class HlwInvoiceServiceImpl extends ServiceImpl<HlwInvoiceMapper, HlwInvo
         return page;
     }
 
+    /**
+     * 创客付款单
+     * @param pageNo
+     * @param pageSize
+     * @param hlwInvoice
+     * @param request
+     * @return
+     */
+    @Override
+    public Page<?> detailList(Integer pageNo, Integer pageSize, HlwInvoice hlwInvoice, HttpServletRequest request) {
+        Page<Map<String, Object>> page = new Page<Map<String, Object>>();
+        //慧盈查询开票申请列表
+        String accessToken = OauthTokenUtils.getDayAccessToken();
+        String requestUrl = OauthApi.PAYMET_DETAIL_LIST;
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("pageNo", pageNo);
+        parameters.put("pageSize", pageSize);
+        parameters.put("paymentId", hlwInvoice.getPaymentId());
+        //数据加密
+        String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
+        JSONObject jsonObject = OauthTokenUtils.doRequest(requestUrl, HttpsContants.POST, biz_content, accessToken);
+        log.info("创客付款单列表===={}", jsonObject);
+        if (jsonObject != null) {
+            if (jsonObject.getBoolean(HttpsContants.SUCCESS_FLAG)) {
+                log.info("创客付款单列表===={}", jsonObject);
+                JSONObject jsonObject1 = jsonObject.getJSONObject("result");
+                List<Map<String, Object>> list = (List<Map<String, Object>>) jsonObject1.get("records");
+                log.info("创客付款单列表==={}", list);
+                page.setRecords(list);
+                page.setTotal(jsonObject1.getLong("total"));
+            } else {
+                throw new JeecgBootException("查询数据异常");
+            }
+        } else {
+            throw new JeecgBootException("查询数据异常");
+        }
+        return page;
+    }
+
     @Override
     public Result<?> invoicePayment(HlwInvoice hlwInvoice, HttpServletRequest request) {
         //慧盈查询开票申请列表

+ 4 - 0
happy-boot-module-settlement/src/main/java/org/jeecg/common/utils/OauthApi.java

@@ -160,6 +160,10 @@ public interface OauthApi {
     //未开票票列表
     public static final String NOT_INVOICE_LIST = "/oauth/hlwInvoice/notInvoiceList";
 
+
+    //创客付款单列表
+    public static final String PAYMET_DETAIL_LIST = "/oauth/hlwInvoice/paymentDetailList";
+
     //校验能否一起开票
     public static final String INVOICE_CHECK_APPLY = "/oauth/hlwInvoice/checkApply";