更新sql和代码规范修改

This commit is contained in:
moxiangrong
2024-02-18 15:26:45 +08:00
parent 6f5e6e4662
commit c132b68745
1293 changed files with 43935 additions and 18456 deletions

View File

@ -27,7 +27,7 @@ public class KdniaoApiBaseDTO {
//API key
private String apiKey;
//请求url
//请求url
//https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx
private String reqURL;

View File

@ -183,11 +183,8 @@ public class KdniaoElectronicsOrderDTO extends KdniaoApiBaseDTO {
/**
* 体积
*
*/
private Double volume;
}

View File

@ -46,7 +46,4 @@ public class KdniaoElectronicsOrderGoodsDTO {
private Double GoodsVol;
}

View File

@ -16,6 +16,7 @@ import java.util.List;
* <p>
* 快递鸟-物流-响应参数
* </p>
*
* @author hupeng
*/
@Data

View File

@ -11,6 +11,7 @@ import lombok.experimental.SuperBuilder;
* <p>
* 快递鸟-面单-响应参数
* </p>
*
* @author hupeng
* @date 2023/7/22
*/
@ -50,7 +51,6 @@ public class KdniaoOrderVO {
private OrderInfo Order;
@Data
@Builder
@NoArgsConstructor

View File

@ -40,10 +40,10 @@ public class KdniaoUtil {
* @param queryDTO 请求参数
* @return 物流信息
*/
public static KdniaoApiVO getLogisticInfo(KdniaoApiDTO queryDTO){
public static KdniaoApiVO getLogisticInfo(KdniaoApiDTO queryDTO) {
KdniaoApiVO kdniaoApiVO = new KdniaoUtil().getLogisticBase(queryDTO);
if (Objects.equals(kdniaoApiVO.getSuccess(), "false")){
throw ServiceExceptionUtil.exception(new ErrorCode(999999,kdniaoApiVO.getReason()));
if (Objects.equals(kdniaoApiVO.getSuccess(), "false")) {
throw ServiceExceptionUtil.exception(new ErrorCode(999999, kdniaoApiVO.getReason()));
}
kdniaoApiVO.handleData();
@ -55,11 +55,11 @@ public class KdniaoUtil {
*/
public static KdniaoOrderVO getOrderInfo(KdniaoElectronicsOrderDTO queryDTO,
List<KdniaoElectronicsOrderGoodsDTO> kdniaoElectronicsOrderGoodsDTOList) {
KdniaoOrderVO kdniaoOrderVO = new KdniaoUtil().getEleCtBase(queryDTO,kdniaoElectronicsOrderGoodsDTOList);
KdniaoOrderVO kdniaoOrderVO = new KdniaoUtil().getEleCtBase(queryDTO, kdniaoElectronicsOrderGoodsDTOList);
//todo 由于目前快递鸟订单打印需要申请当地营业网店账号 所有目前这个没法测试 如果有其他用户有可以测试反馈给我们官方
if (Objects.equals(kdniaoOrderVO.getSuccess(), "false")){
if (Objects.equals(kdniaoOrderVO.getSuccess(), "false")) {
log.error(kdniaoOrderVO.getReason());
throw ServiceExceptionUtil.exception(new ErrorCode(999999,kdniaoOrderVO.getReason()));
throw ServiceExceptionUtil.exception(new ErrorCode(999999, kdniaoOrderVO.getReason()));
}
return kdniaoOrderVO;
@ -84,7 +84,7 @@ public class KdniaoUtil {
requestParamMap.put("LogisticCode", logisticCode);
String RequestData = JSON.toJSONString(requestParamMap);
// 组装系统级参数
Map<String, String> params = new HashMap<>();
Map<String, String> params = new HashMap<>();
params.put("RequestData", this.urlEncoder(RequestData));
params.put("EBusinessID", EBusinessID);
params.put("RequestType", "1002");//免费1002 收费8001
@ -109,8 +109,8 @@ public class KdniaoUtil {
String ApiKey = queryDTO.getApiKey();
Map<String, Object> requestParamMap = this.doMap(queryDTO,kdniaoElectronicsOrderGoodsDTOList);
System.out.println("map:"+requestParamMap);
Map<String, Object> requestParamMap = this.doMap(queryDTO, kdniaoElectronicsOrderGoodsDTOList);
System.out.println("map:" + requestParamMap);
String RequestData = JSON.toJSONString(requestParamMap);
// 组装系统级参数
Map<String, String> params = new HashMap<>();
@ -127,7 +127,7 @@ public class KdniaoUtil {
//组合数据
private Map<String, Object> doMap(KdniaoElectronicsOrderDTO queryDTO,
List<KdniaoElectronicsOrderGoodsDTO> kdniaoElectronicsOrderGoodsDTOList){
List<KdniaoElectronicsOrderGoodsDTO> kdniaoElectronicsOrderGoodsDTOList) {
// 组装应用级参数
Map<String, Object> requestParamMap = new HashMap<>();