feat: 阿里采购送货单的业务对接

src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java

@@ -9,6 +9,7 @@ import com.glxp.api.annotation.Log;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
+import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.alihealth.AliYljgBillDetail;
 import com.glxp.api.entity.alihealth.AliYljgBillDetailDrugCode;
 import com.glxp.api.entity.alihealth.AliYljgSearchbill;
@@ -36,7 +37,7 @@ import java.util.Map;
 
 @Slf4j
 @RestController
-public class AlihealthBusController {
+public class AlihealthBusController extends BaseController {
     @Resource
     private AlihealthUtils alihealthUtils;
     @Value("${ALIHEALTH_URL:http://gw.api.taobao.com/router/rest}")
@@ -158,6 +159,8 @@ public class AlihealthBusController {
     @PostMapping("/spms/alihealth/aliYljgSearchbillPage")
     @Log(title = "获取阿里药品的采购单", businessType = BusinessType.OTHER)
     public BaseResponse aliYljgSearchbillPage(@RequestBody AliYljgSearchbillReqeust aliYljgSearchbillReqeust) {
+        String customerId = getCustomerId();
+        aliYljgSearchbillReqeust.setErpId(customerId);
         List<AliYljgSearchbill> list = alihealthBusService.aliYljgSearchbillPage(aliYljgSearchbillReqeust);
         PageInfo<AliYljgSearchbill> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);

src/main/java/com/glxp/api/req/alihealth/AliYljgSearchbillReqeust.java

@@ -130,6 +130,7 @@ public class AliYljgSearchbillReqeust extends ListPageRequest {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
-
+    private String  beginDate;
+    private String  ensDate;
 
 }

src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java

@@ -1,14 +1,20 @@
 package com.glxp.api.service.alihealth.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.entity.alihealth.AliYljgBillDetail;
 import com.glxp.api.entity.alihealth.AliYljgBillDetailDrug;
 import com.glxp.api.entity.alihealth.AliYljgBillDetailDrugCode;
 import com.glxp.api.entity.alihealth.AliYljgSearchbill;
+import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust;
+import com.glxp.api.req.alihealth.AlihealthYljgListupoutDetailReqeust;
+import com.glxp.api.req.alihealth.AlihealthYljgListupoutReqeust;
 import com.glxp.api.service.alihealth.AlihealthBusService;
+import com.glxp.api.util.alihealth.AlihealthYljgUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -16,53 +22,50 @@ import java.util.List;
 @Service
 public class AlihealthBusServiceImpl implements AlihealthBusService {
 
+    @Resource
+    private AlihealthYljgUtils alihealthYljgUtils;
 
     @Override
     public List<AliYljgSearchbill> aliYljgSearchbillPage(AliYljgSearchbillReqeust aliYljgSearchbillReqeust) {
         if (aliYljgSearchbillReqeust == null) {
             return Collections.emptyList();
         }
+
+        AlihealthYljgListupoutReqeust alihealthYljgListupoutReqeust1 = new AlihealthYljgListupoutReqeust();
+        alihealthYljgListupoutReqeust1.setBegin_date(aliYljgSearchbillReqeust.getBeginDate());
+        alihealthYljgListupoutReqeust1.setEnd_date(aliYljgSearchbillReqeust.getEnsDate());
+
         if (aliYljgSearchbillReqeust.getPage() != null) {
-            int offset = (aliYljgSearchbillReqeust.getPage() - 1) * aliYljgSearchbillReqeust.getLimit();
+            alihealthYljgListupoutReqeust1.setPage(aliYljgSearchbillReqeust.getPage());
-            PageHelper.offsetPage(offset, aliYljgSearchbillReqeust.getLimit());
+            alihealthYljgListupoutReqeust1.setPage_size(aliYljgSearchbillReqeust.getLimit());
+        }else {
+            alihealthYljgListupoutReqeust1.setPage(1);
+            alihealthYljgListupoutReqeust1.setPage_size(20);
+        }
+
+        BaseResponse<List<AliYljgSearchbill>> listBaseResponse = alihealthYljgUtils.listupout(alihealthYljgListupoutReqeust1, aliYljgSearchbillReqeust.getErpId());
+        if (listBaseResponse.getCode() == 20000){
+            List<AliYljgSearchbill> data = listBaseResponse.getData();
+            return data;
+        }else {
+            throw new JsonException(listBaseResponse.getMessage());
         }
-        // TODO: 2024/12/12
-        List<AliYljgSearchbill> list = new ArrayList<>();
-        AliYljgSearchbill aliYljgSearchbill1 = new AliYljgSearchbill();
-        aliYljgSearchbill1.setBillCode("12121221");
-        AliYljgSearchbill aliYljgSearchbill2 = new AliYljgSearchbill();
-        aliYljgSearchbill2.setBillCode("34432432424");
-        list.add(aliYljgSearchbill1);
-        list.add(aliYljgSearchbill2);
-        return list;
     }
 
     @Override
     public AliYljgBillDetail aliYljgBillDetail(AliYljgSearchbillReqeust aliYljgSearchbillReqeust) {
-        // TODO: 2024/12/12
+        AlihealthYljgListupoutDetailReqeust alihealthYljgListupoutDetailReqeust = new AlihealthYljgListupoutDetailReqeust();
+        alihealthYljgListupoutDetailReqeust.setBill_code(aliYljgSearchbillReqeust.getBillCode());
+        alihealthYljgListupoutDetailReqeust.setFrom_ref_user_id(aliYljgSearchbillReqeust.getFromRefUserId());
 
-        AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode1 = new AliYljgBillDetailDrugCode();
+        BaseResponse<AliYljgBillDetail> aliYljgBillDetailBaseResponse = alihealthYljgUtils.listupoutDetail(alihealthYljgListupoutDetailReqeust);
-        AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode2 = new AliYljgBillDetailDrugCode();
+        if (aliYljgBillDetailBaseResponse.getCode() == 20000){
-        aliYljgBillDetailDrugCode1.setCode("112121111111d");
+            AliYljgBillDetail data = aliYljgBillDetailBaseResponse.getData();
-        aliYljgBillDetailDrugCode2.setCode("5342343242343242342");
+            return data;
-        List<AliYljgBillDetailDrugCode> aliYljgBillDetailDrugCodeList = new ArrayList<>();
+        }else {
-        aliYljgBillDetailDrugCodeList.add(aliYljgBillDetailDrugCode1);
+            throw new JsonException(aliYljgBillDetailBaseResponse.getMessage());
-        aliYljgBillDetailDrugCodeList.add(aliYljgBillDetailDrugCode2);
+        }
-
-        AliYljgBillDetail aliYljgBillDetail = new AliYljgBillDetail();
-        List<AliYljgBillDetailDrug> aliYljgBillDetailDrugList = new ArrayList<>();
-        AliYljgBillDetailDrug aliYljgBillDetailDrug1 = new AliYljgBillDetailDrug();
-        aliYljgBillDetailDrug1.setProdName("dabhbuidiqwiduqbiudqib");
-        aliYljgBillDetailDrug1.setAliYljgBillDetailDrugCodeList(aliYljgBillDetailDrugCodeList);
-
-        AliYljgBillDetailDrug aliYljgBillDetailDrug2 = new AliYljgBillDetailDrug();
-        aliYljgBillDetailDrug2.setProdName("dabhbuidiqwiduqbiudqib");
-        aliYljgBillDetailDrug2.setAliYljgBillDetailDrugCodeList(aliYljgBillDetailDrugCodeList);
-        aliYljgBillDetailDrugList.add(aliYljgBillDetailDrug1);
-        aliYljgBillDetailDrugList.add(aliYljgBillDetailDrug2);
 
-        aliYljgBillDetail.setAliYljgBillDetailDrugList(aliYljgBillDetailDrugList);
-        return aliYljgBillDetail;
     }
 
 }