Merge remote-tracking branch 'origin/dev_drug' into dev_drug

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

@@ -23,6 +23,7 @@ import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.alihealth.AlihealthKytGetentinfoResponse;
 import com.glxp.api.service.alihealth.AlihealthBusService;
+import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.util.alihealth.AlihealthUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -150,6 +151,8 @@ public class AlihealthBusController extends BaseController {
 
     @Resource
     AlihealthBusService alihealthBusService;
+    @Resource
+    IoOrderService orderService;
 
     /**
      * 阿里的采购单查询接口
@@ -179,7 +182,14 @@ public class AlihealthBusController extends BaseController {
             List<AliYljgSearchbill> group = entry.getValue();
             if (!group.isEmpty()) {
                 // 添加每个分组中的第一个对象到新列表
-                listResp.add(group.get(0));
+                String key = entry.getKey();
+                //如果查得到就不可以再次选入
+                String billNo = orderService.selectAliYljgSearchbillByAliBillNo(key);
+                AliYljgSearchbill aliYljgSearchbill = group.get(0);
+                if (StringUtils.isNotEmpty(billNo)){
+                    aliYljgSearchbill.setCheckBillNO(true);
+                }
+                listResp.add(aliYljgSearchbill);
             }
         }
 

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -730,6 +730,8 @@ public class IoOrderDetailBizController extends BaseController {
 
 
         IoOrderEntity ioOrderEntity = addBizProductReqeust.getOrderEntity();
+        addBizProductReqeust.setAliOrderBillNo(billCode);
+        ioOrderEntity.setAliOrderBillNo(billCode);
         for (int i = 0; i < aliYljgBillDetailDrugList.size(); i++) {
             AliYljgBillDetailDrug aliYljgBillDetailDrug = aliYljgBillDetailDrugList.get(i);
 

src/main/java/com/glxp/api/dao/inout/IoOrderDao.java

@@ -65,4 +65,5 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
     String selectActionByBillNo(@Param("billNo") String billNo);
 
 
+    String selectAliYljgSearchbillByAliBillNo(@Param("aliOrderBillNo") String aliOrderBillNo);
 }

src/main/java/com/glxp/api/entity/alihealth/AliYljgSearchbill.java

@@ -127,4 +127,5 @@ public class AliYljgSearchbill {
     private Date updateTime;
 
 
+    private boolean checkBillNO = false;
 }

src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java

@@ -278,4 +278,9 @@ public class IoOrderEntity {
     private Integer productType;
 
 
+    /**
+     * 来源阿里订单号
+     */
+    @TableField(value = "aliOrderBillNo")
+    private String aliOrderBillNo;
 }

src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java

@@ -23,6 +23,7 @@ public class AddBizProductReqeust {
     private String expireDate;
     private Integer count;
     private Integer productType;
+    private String aliOrderBillNo;
 
     List<AddBizProductReqeust> datas;           //多选添加
     AliYljgSearchbill aliData;           //多选添加

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -138,4 +138,6 @@ public interface IoOrderService {
      * @param oldIoOrderEntity
      */
     boolean copyOrder(AuthAdmin authAdmin,String newBillNo, IoOrderEntity newIoOrderEntity, IoOrderEntity oldIoOrderEntity);
+
+    String selectAliYljgSearchbillByAliBillNo(String key);
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -909,6 +909,11 @@ public class IoOrderServiceImpl implements IoOrderService {
         return false;
     }
 
+    @Override
+    public String selectAliYljgSearchbillByAliBillNo(String key) {
+        return orderDao.selectAliYljgSearchbillByAliBillNo(key);
+    }
+
     /**
      * 查询此单据关联的所有单据
      *

src/main/resources/mybatis/mapper/inout/IoOrderDao.xml

@@ -435,6 +435,13 @@
         where billNo = #{billNo}
     </select>
 
+    <select id="selectAliYljgSearchbillByAliBillNo" resultType="java.lang.String">
+        select aliOrderBillNo
+        from io_order
+        where aliOrderBillNo = #{aliOrderBillNo}
+        limit 1
+    </select>
+
 
     <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
         SELECT io.*,

src/main/resources/schemas/schema_v2.4.sql

@@ -1249,3 +1249,8 @@ CALL Pro_Temp_ColumnWork('auth_company', 'refEntId',
                          '   varchar(255) DEFAULT NULL COMMENT ''接口调用企业的唯一标识''',
                          1);
 call Modify_UNIQUE_index('io_code_lost', 'code', 'uniqueCode', 'BTREE');
+
+
+CALL Pro_Temp_ColumnWork('io_order', 'aliOrderBillNo',
+                         '  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''阿里来源单号''',
+                         1);