第三方接口优化，补齐，新增批次号校验，中继服务修改
parent
b2662c1d33
commit
7000885bcf
@ -0,0 +1,16 @@
|
||||
package com.glxp.api.admin.dao.basic;
|
||||
|
||||
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
|
||||
import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface BasicThirdSysBusApiDao {
|
||||
boolean insertSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity);
|
||||
|
||||
boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity);
|
||||
|
||||
List<BasicThirdSysBusApiEntity> filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest);
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.glxp.api.admin.entity.basic;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class BasicThirdSysBusApiEntity {
|
||||
|
||||
private Integer id;
|
||||
private String code;
|
||||
private String name;
|
||||
private String thirdSys;
|
||||
private String url;
|
||||
private Integer type;
|
||||
private String remark;
|
||||
|
||||
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package com.glxp.api.admin.httpclient;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.alibaba.fastjson.TypeReference;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
|
||||
public class SmpClient {
|
||||
|
||||
public void uploadCorp(){
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.glxp.api.admin.httpclient.req;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class UdiwmsBusTypeRequest {
|
||||
|
||||
private String id;
|
||||
private String code;
|
||||
private String name;
|
||||
private Integer limit;
|
||||
private Integer page;
|
||||
private String thirdSys;
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package com.glxp.api.admin.httpclient.req;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class UdiwmsOrderDetail {
|
||||
|
||||
private String productId; //产品编码
|
||||
private BigDecimal price; //单价
|
||||
private String batchNo; //批次号
|
||||
private String expireDate; //失效日期
|
||||
private String productDate; //生产日期
|
||||
private String standard; //规格型号
|
||||
private String productName; //产品名称
|
||||
private Integer count; //数量
|
||||
private Integer reCount; //数量
|
||||
private String remark; //备注
|
||||
private String remark1; //备注1/规格型号ID
|
||||
private String remark2; //备注2/型号
|
||||
private String remark3; //备注3/规格
|
||||
|
||||
//阳光采购平台 耗材目录规格id
|
||||
private String productSpecId;
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.glxp.api.admin.service.basic;
|
||||
|
||||
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
|
||||
import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity;
|
||||
import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface BasicThirdSysBusApiService {
|
||||
|
||||
boolean insertSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity);
|
||||
|
||||
boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity);
|
||||
|
||||
BasicThirdSysBusApiEntity selectByKey(String key, String thirdSys);
|
||||
|
||||
List<BasicThirdSysBusApiEntity> filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
package com.glxp.api.admin.service.basic.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import com.glxp.api.admin.dao.basic.BasicThirdSysBusApiDao;
|
||||
import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
|
||||
import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest;
|
||||
import com.glxp.api.admin.service.basic.BasicThirdSysBusApiService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class BasicThirdSysBusApiServiceImpl implements BasicThirdSysBusApiService {
|
||||
|
||||
@Resource
|
||||
BasicThirdSysBusApiDao basicThirdSysBusApiDao;
|
||||
|
||||
@Override
|
||||
public boolean insertSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity) {
|
||||
return basicThirdSysBusApiDao.insertSysBusApi(basicThirdSysEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean updateSysBusApi(BasicThirdSysBusApiEntity basicThirdSysEntity) {
|
||||
return basicThirdSysBusApiDao.updateSysBusApi(basicThirdSysEntity);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BasicThirdSysBusApiEntity selectByKey(String key, String thirdSys) {
|
||||
FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest = new FilterBasicThirdSysDetailRequest();
|
||||
filterBasicThirdSysDetailRequest.setThirdSysFk(thirdSys);
|
||||
filterBasicThirdSysDetailRequest.setKey(key);
|
||||
List<BasicThirdSysBusApiEntity> basicThirdSysBusApiEntities = basicThirdSysBusApiDao.filterSysBusApi(filterBasicThirdSysDetailRequest);
|
||||
if (CollUtil.isNotEmpty(basicThirdSysBusApiEntities)) {
|
||||
return basicThirdSysBusApiEntities.get(0);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BasicThirdSysBusApiEntity> filterSysBusApi(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest) {
|
||||
return basicThirdSysBusApiDao.filterSysBusApi(filterBasicThirdSysDetailRequest);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,59 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
|
||||
<mapper namespace="com.glxp.api.admin.dao.basic.BasicThirdSysBusApiDao">
|
||||
|
||||
<update id="updateSysBusApi" parameterType="com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity">
|
||||
UPDATE basic_third_sys_bus_api
|
||||
<trim prefix="set" suffixOverrides=",">
|
||||
<if test="code != null">code=#{code},</if>
|
||||
<if test="name != null">`name`=#{name},</if>
|
||||
<if test="thirdSys != null">thirdSys=#{thirdSys},</if>
|
||||
<if test="url != null">url=#{url},</if>
|
||||
<if test="type != null">`type`=#{type},</if>
|
||||
<if test="remark != null">remark=#{remark},</if>
|
||||
</trim>
|
||||
WHERE id=#{id}
|
||||
</update>
|
||||
|
||||
<select id="filterSysBusApi" parameterType="com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest"
|
||||
resultType="com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity">
|
||||
SELECT * FROM basic_third_sys_bus_api
|
||||
<where>
|
||||
<if test="key != '' and key != null">
|
||||
AND code = #{code}
|
||||
</if>
|
||||
<if test="type != '' and type != null">
|
||||
AND type = #{type}
|
||||
</if>
|
||||
<if test="code != '' and code != null">
|
||||
AND code = #{code}
|
||||
</if>
|
||||
<if test="name != '' and name != null">
|
||||
AND name = #{name}
|
||||
</if>
|
||||
<if test="thirdSysFk != '' and thirdSysFk != null">
|
||||
AND thirdSys = #{thirdSysFk}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
<insert id="insertSysBusApi" keyProperty="id"
|
||||
parameterType="com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity">
|
||||
insert
|
||||
ignore
|
||||
INTO basic_third_sys_bus_api
|
||||
(`code`,`name`,`thirdSys`,url,`type`,remark)
|
||||
values
|
||||
(
|
||||
#{code},
|
||||
#{name},
|
||||
#{thirdSys},
|
||||
#{url},
|
||||
#{type},
|
||||
#{remark}
|
||||
)
|
||||
</insert>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue