From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
index 716bc06..b003421 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
@@ -1,12 +1,23 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone35.constant.Phone35Constant;
+import com.ld.igds.phone35.dto.DtoOrder;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
+import com.ld.igds.phone35.mapper.Phone35Mapper;
+import com.ld.igds.phone35.param.Phone35OrderCommonParam;
+import com.ld.igds.phone35.param.Phone35PatrolCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
+import com.ld.igds.phone35.util.Phone35Util;
+import com.ld.igds.phone35.util.PhoneRespUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 宸ュ崟璁板綍
@@ -15,6 +26,12 @@
*/
@Service
public class Phone35ServiceImpl5702 implements Phone35Service {
+
+ @Autowired
+ private Phone35Util phone35Util;
+ @Autowired
+ private Phone35Mapper phone35Mapper;
+
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5702;
@@ -22,7 +39,21 @@
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
+ //杞寲瀵硅薄
+ Phone35OrderCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35OrderCommonParam.class);
+ if (null == param) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ //鍙傛暟楠岃瘉
+ if (StringUtils.isEmpty(param.getUserName())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
+ }
+ param.setCompanyId(phone35AuthUser.getCompanyId());
+ List<DtoOrder> list = phone35Mapper.getOrderList(param);
+ for (DtoOrder dtoOrder : list) {
+ dtoOrder.setDepotName(phone35Util.getDepotName(phone35AuthUser.getCompanyId(), dtoOrder.getDepotId()));
+ }
//todo 宸ュ崟璁板綍
- return null;
+ return PhoneRespUtil.success(list, req);
}
}
--
Gitblit v1.9.3