From 46eed722cd0431aa433bea2470b23015b8d83b3e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 21 二月 2022 10:03:25 +0800
Subject: [PATCH] 优化三亚物业 临时收费问题
---
service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java b/service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java
index 5dfb8fb..58c0e32 100755
--- a/service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java
+++ b/service-order/src/main/java/com/java110/order/smo/impl/OIdServiceSMOImpl.java
@@ -3,27 +3,23 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.client.RestTemplate;
+import com.java110.core.context.SecureInvocation;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.businessDatabus.BusinessDatabusDto;
+import com.java110.dto.app.AppDto;
import com.java110.dto.businessTableHis.BusinessTableHisDto;
import com.java110.dto.order.OrderDto;
import com.java110.dto.order.OrderItemDto;
-import com.java110.entity.order.Business;
-import com.java110.intf.job.IDataBusInnerServiceSMO;
import com.java110.order.dao.ICenterServiceDAO;
import com.java110.order.smo.IAsynNotifySubService;
import com.java110.order.smo.IOIdServiceSMO;
import com.java110.utils.cache.BusinessTableHisCache;
-import com.java110.utils.cache.DatabusCache;
-import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.DomainContant;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
@@ -49,7 +45,6 @@
public static final String SERVICE_NAME = "SERVICE_NAME";
-
@Autowired
private ICenterServiceDAO centerServiceDAOImpl;
@@ -60,30 +55,29 @@
private IAsynNotifySubService asynNotifySubServiceImpl;
-
-
@Override
public ResponseEntity<String> createOId(OrderDto orderDto) {
orderDto.setoId(GenerateCodeFactory.getOId());
if (StringUtil.isEmpty(orderDto.getAppId())) {
- throw new IllegalArgumentException("鏈寘鍚玜ppId");
+ orderDto.setAppId(AppDto.WEB_APP_ID);
}
if (StringUtil.isEmpty(orderDto.getExtTransactionId())) {
- throw new IllegalArgumentException("鏈寘鍚氦浜掓棩蹇�");
+ orderDto.setExtTransactionId(GenerateCodeFactory.getTransactionId());
}
if (StringUtil.isEmpty(orderDto.getRequestTime())) {
- throw new IllegalArgumentException("鏈寘鍚姹傛椂闂�");
+ orderDto.setRequestTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
}
if (StringUtil.isEmpty(orderDto.getUserId())) {
- throw new IllegalArgumentException("鏈寘鍚敤鎴稩D");
+ orderDto.setUserId("-1");
}
//淇濆瓨璁㈠崟淇℃伅
- centerServiceDAOImpl.saveOrder(BeanConvertUtil.beanCovertMap(orderDto));
+ centerServiceDAOImpl.saveOrder(BeanConvertUtil.beanCovertMap(orderDto));
+
return new ResponseEntity<String>(JSONObject.toJSONString(orderDto), HttpStatus.OK);
}
@@ -341,10 +335,12 @@
business.put("bId", orderItemDto.getbId());
centerServiceDAOImpl.saveBusiness(business);
- //閫氱煡瀛愭湇鍔＄敓鎴� business 鏁版嵁
+ //閫氱煡瀛愭湇鍔＄敓鎴� business 鏁版嵁,濡傛灉閰嶇疆NO 涓嶉�氱煡鐢熸垚 business 鏁版嵁
+ if (BusinessTableHisDto.ACTION_OBJ_HIS_NO.equals(businessTableHisDto.getActionObjHis())) {
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
+ }
+
doNoticeServiceGeneratorBusiness(orderItemDto, businessTableHisDto);
-
-
return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
}
@@ -395,11 +391,10 @@
//鍒犻櫎 浜嬪姟鏃ュ織
//centerServiceDAOImpl.deleteUnItemLog(info);
- asynNotifySubServiceImpl.notifyDatabus(orderItemMaps,orderDto);
+ asynNotifySubServiceImpl.notifyDatabus(orderItemMaps, orderDto);
return ResultVo.createResponseEntity(ResultVo.CODE_OK, ResultVo.MSG_OK);
}
-
}
--
Gitblit v1.8.0