From d48d966dfde7a0c31bd81466559e5e8d681dc200 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 21 十月 2023 16:16:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java
index 734fa74..3ea1403 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1503.java
@@ -2,10 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.bstek.bdf2.core.model.DefaultDept;
-import com.ld.igds.constant.RedisConst;
import com.ld.igds.log.service.InteStatusLogService;
-import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.InoutContract;
+import com.ld.igds.models.InteStatusLog;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1503;
import com.ld.igds.sh.param.ApiRequest;
@@ -22,8 +21,9 @@
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* 鍚堝悓淇℃伅鏁版嵁鎺ュ彛
@@ -38,8 +38,6 @@
private HApiShServiceImpl hApiShServiceImpl;
@Autowired
private InteStatusLogService inteStatusLogService;
- @Autowired
- private RedisUtil redisUtil;
@Override
public String getInterfaceId() {
return ApiShConst.API_SH_1503;
@@ -55,16 +53,19 @@
String companyId = ContextUtil.getDefaultCompanyId();
- String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1503);
- Date startTime = (Date) redisUtil.get(key);
- if(null == startTime){
- startTime = DateUtils.addDays(param.getEndTime(), -100);
+// String key = RedisConst.buildKey(companyId, ApiShConst.API_SH_1112);
+// Date startTime = (Date) redisUtil.get(key);
+// if(null == startTime){
+// startTime = DateUtils.addDays(param.getEndTime(), -30);
+// }
+// redisUtil.set(key, param.getEndTime());
+ if(null == param.getStartTime()){
+ param.setStartTime(DateUtils.addDays(param.getEndTime(), -1));
}
- redisUtil.set(key, param.getEndTime());
//鏌ヨ鍚堝悓淇℃伅
List<InoutContract> dataList = hApiShServiceImpl.listContract(companyId,
- startTime, param.getEndTime());
+ param.getStartTime(), param.getEndTime());
//鍝嶅簲鏁版嵁涓虹┖鍒欑洿鎺ヨ繑鍥炲搷搴旂爜2000
if(dataList == null || dataList.isEmpty()){
@@ -96,7 +97,7 @@
dto1503.setQddd(StringUtils.isEmpty(contract.getSignAddress())?"0":contract.getSignAddress());
if(contract.getPrice() != null){
- dto1503.setHtdj(String.valueOf(contract.getPrice()));
+ dto1503.setHtdj(String.valueOf(contract.getPrice()*1000));
}
if(contract.getMoney() != null){
dto1503.setHtzje(String.valueOf(contract.getMoney()));
--
Gitblit v1.9.3