B2B应收对账

applications/sale/sale-server/pom.xml

@@ -46,6 +46,12 @@
           <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+          <groupId>b2b-access</groupId>
+          <artifactId>b2b-access-core</artifactId>
+          <version>1.0-SNAPSHOT</version>
+        </dependency>
+
         <!--test-->
         <dependency>
             <groupId>com.usoftchina.saas</groupId>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/B2BApCheckController.java

@@ -0,0 +1,68 @@
+package com.usoftchina.saas.sale.controller;
+
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.sale.dto.apcheck.SaveOperationData;
+import com.usoftchina.saas.sale.service.ApCheckService;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Description B2B应收对账
+ * @Author chenwei
+ * @Date 2019/01/28
+ */
+@RestController("/b2b/apCheck")
+public class B2BApCheckController {
+
+    private ApCheckService apCheckService;
+
+    /**
+     * 获取应收对账单客户列表
+     * @param count
+     * @param page
+     * @param searchFilter
+     * @param sorting
+     * @return
+     */
+    @GetMapping("/apCheck/customer")
+    public Result custApcheck(int count, int page, String searchFilter, String sorting){
+        return Result.success(apCheckService.getCustApcheck(count, page, searchFilter, sorting));
+    }
+
+    /**
+     * 获取单个客户对账明细（客户列表点击明细按钮）
+     * @param fromDate
+     * @param endDate
+     * @param customerUU
+     * @param taxRate
+     * @param factory
+     * @param prodTitle
+     * @param suuorname
+     * @param prodSpec
+     * @return
+     */
+    @GetMapping("/apCheck/getAllByKeywords")
+    public Result getAllByKeywords(Long fromDate, Long endDate, Long customerUU, Double taxRate, String factory,
+                                   String prodTitle, String suuorname, String prodSpec){
+        return Result.success(apCheckService.getAllByKeywords(fromDate, endDate, customerUU, taxRate, factory, prodTitle, suuorname, prodSpec));
+    }
+
+    /**
+     * 生成对账
+     * @param saveOperationData
+     * @return
+     */
+    @PostMapping("/apCheck/operation/save")
+    public Result operationSave(@RequestBody SaveOperationData saveOperationData){
+        return Result.success(apCheckService.operationSave(saveOperationData));
+    }
+
+    /**
+     * 某张对账单明细：
+     * @param id
+     * @return
+     */
+    @GetMapping("/apCheck/{id}/info")
+    public Result apCheckInfo(@PathVariable("id") Long id){
+        return Result.success(apCheckService.apCheckInfo(id));
+    }
+}

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -228,51 +228,4 @@ public class SaleController {
         return Result.success(saleService.saveQuote(publicInquiryItem));
     }
 
-    /**
-     * 获取应收对账单客户列表
-     * @return
-     */
-    @GetMapping("/apCheck/customer")
-    public Result custApcheck(int count, int page, String searchFilter, String sorting){
-        return Result.success(saleService.getCustApcheck(count, page, searchFilter, sorting));
-    }
-
-    /**
-     * 获取单个客户对账明细（客户列表点击明细按钮）
-     * @param fromDate
-     * @param endDate
-     * @param customerUU
-     * @param taxRate
-     * @param factory
-     * @param prodTitle
-     * @param suuorname
-     * @param prodSpec
-     * @return
-     */
-    @GetMapping("/apCheck/getAllByKeywords")
-    public Result getAllByKeywords(Long fromDate, Long endDate, Long customerUU, Double taxRate, String factory,
-                                   String prodTitle, String suuorname, String prodSpec){
-        return Result.success(saleService.getAllByKeywords(fromDate, endDate, customerUU, taxRate, factory, prodTitle, suuorname, prodSpec));
-    }
-
-    /**
-     * 生成对账
-     * @param saveOperationData
-     * @return
-     */
-    @PostMapping("/apCheck/operation/save")
-    public Result operationSave(@RequestBody SaveOperationData saveOperationData){
-        return Result.success(saleService.operationSave(saveOperationData));
-    }
-
-    /**
-     * 某张对账单明细：
-     * @param id
-     * @return
-     */
-    @GetMapping("/apCheck/{id}/info")
-    public Result apCheckInfo(@PathVariable("id") Long id){
-        saleService.apCheckInfo(id);
-        return Result.success();
-    }
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/ApCheckService.java

@@ -0,0 +1,23 @@
+package com.usoftchina.saas.sale.service;
+
+import com.usoftchina.saas.sale.dto.apcheck.ApCheckProdIO;
+import com.usoftchina.saas.sale.dto.apcheck.CustApcheckData;
+import com.usoftchina.saas.sale.dto.apcheck.PurchaseApCheck;
+import com.usoftchina.saas.sale.dto.apcheck.SaveOperationData;
+import org.springframework.ui.ModelMap;
+
+/**
+ * @Author chenwei
+ * @Date 2019/01/28
+ */
+public interface ApCheckService {
+
+    String getCustApcheck(int count, int page, String searchFilter, String sorting);
+
+    String getAllByKeywords(Long fromDate, Long endDate, Long customerUU, Double taxRate, String factory,
+                            String prodTitle, String suuorname, String prodSpec);
+
+    ModelMap operationSave(SaveOperationData saveOperationData);
+
+    String apCheckInfo(Long id);
+}

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/SaleService.java

@@ -61,12 +61,4 @@ public interface SaleService {
 
     String saveQuote(PublicInquiryItem publicInquiryItem);
 
-    CustApcheckData getCustApcheck(int count, int page, String searchFilter, String sorting);
-
-    ApCheckProdIO getAllByKeywords(Long fromDate, Long endDate, Long customerUU, Double taxRate, String factory,
-                                   String prodTitle, String suuorname, String prodSpec);
-
-    ModelMap operationSave(SaveOperationData saveOperationData);
-
-    PurchaseApCheck apCheckInfo(Long id);
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/ApCheckServiceImpl.java

@@ -0,0 +1,62 @@
+package com.usoftchina.saas.sale.service.impl;
+
+import com.usoft.b2b.access.entity.UserAccount;
+import com.usoft.b2b.access.utils.AccessUtils;
+import com.usoftchina.saas.account.api.AccountApi;
+import com.usoftchina.saas.account.api.CompanyApi;
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.sale.dto.apcheck.SaveOperationData;
+import com.usoftchina.saas.sale.service.ApCheckService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ModelMap;
+
+/**
+ * @Author chenwei
+ * @Date 2019/01/28
+ */
+@Service
+public class ApCheckServiceImpl implements ApCheckService {
+
+    @Value("${b2b.baseUrl.common}")
+    private String b2bUrl;
+    @Autowired
+    private AccountApi accountApi;
+    @Autowired
+    private CompanyApi companyApi;
+
+    @Override
+    public String getCustApcheck(int count, int page, String searchFilter, String sorting) {
+        Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
+        Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
+        UserAccount account = new UserAccount();
+        account.setAppId("SAAS");
+        account.setUserUU(userUU);
+        account.setSpaceUU(enUU);
+        String getUrl = b2bUrl + "/sale/apCheck/customer?count=" + count + "&page=" + page + "&searchFilter=" + searchFilter + " &sorting=" + sorting;
+        String result = null;
+        try {
+            result = AccessUtils.getForObject(getUrl, account, String.class);
+        } catch (Exception e) {
+            throw new BizException(80000, e.getMessage());
+        }
+        return result;
+    }
+
+    @Override
+    public String getAllByKeywords(Long fromDate, Long endDate, Long customerUU, Double taxRate, String factory, String prodTitle, String suuorname, String prodSpec) {
+        return null;
+    }
+
+    @Override
+    public ModelMap operationSave(SaveOperationData saveOperationData) {
+        return null;
+    }
+
+    @Override
+    public String apCheckInfo(Long id) {
+        return null;
+    }
+}

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -747,26 +747,6 @@ public class SaleServiceImpl implements SaleService{
         return null;
     }
 
-    @Override
-    public CustApcheckData getCustApcheck(int count, int page, String searchFilter, String sorting) {
-        return null;
-    }
-
-    @Override
-    public ApCheckProdIO getAllByKeywords(Long fromDate, Long endDate, Long customerUU, Double taxRate, String factory, String prodTitle, String suuorname, String prodSpec) {
-        return null;
-    }
-
-    @Override
-    public ModelMap operationSave(SaveOperationData saveOperationData) {
-        return null;
-    }
-
-    @Override
-    public PurchaseApCheck apCheckInfo(Long id) {
-        return null;
-    }
-
     /**
      * 将平台返回的结果集转成SAAS的传输对象
      * @param data

applications/sale/sale-server/src/test/java/com/usoftchina/saas/sale/controller/b2bTest.java

@@ -0,0 +1,38 @@
+package com.usoftchina.saas.sale.controller;
+
+import com.usoft.b2b.access.entity.UserAccount;
+import com.usoft.b2b.access.utils.AccessUtils;
+import org.junit.Test;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+/**
+ * @Description TODO
+ * @Author chenwei
+ * @Date 2019/01/28
+ */
+public class b2bTest {
+
+    @Test
+    public void cookieVisit() throws Exception {
+        UserAccount account = new UserAccount();
+        account.setAppId("SAAS");
+        account.setUserUU(1000003217L);
+        account.setSpaceUU(10041166L);
+        String result = AccessUtils.getForObject("https://rel-b2b.uuzcc.cn/sale/apCheck/5113/info", account, String.class);
+        System.out.println(result);
+    }
+
+    @Test
+    public void testPost() throws Exception {
+        UserAccount account = new UserAccount();
+        account.setAppId("SAAS");
+        account.setUserUU(1000003217L);
+        account.setSpaceUU(10041166L);
+        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+        map.add("json", "this is an json");
+        String result = AccessUtils.postForObject("http://10.1.51.24:8088/platform-b2b//product/kind/test", account, String.class, map);
+        System.out.println(result);
+    }
+
+}