Commit dd250592 by zhaoliang.huang

2021年9月18日-开票历史列表接口+详情接口+发票所含订单接口-黄兆良

parent d5941a4d
...@@ -83,6 +83,7 @@ import com.freemud.api.assortment.datamanager.meal.MealCacheManager; ...@@ -83,6 +83,7 @@ import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
import com.freemud.application.sdk.api.constant.ResponseConstant; import com.freemud.application.sdk.api.constant.ResponseConstant;
import com.freemud.application.sdk.api.constant.ResponseResultEnum; import com.freemud.application.sdk.api.constant.ResponseResultEnum;
import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCouponSdkService; import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCouponSdkService;
import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog; import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.common.OrderAndShoppingCommonRedisKey; import com.freemud.application.sdk.api.ordercenter.common.OrderAndShoppingCommonRedisKey;
...@@ -4376,6 +4377,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4376,6 +4377,7 @@ public class OrderServiceImpl implements Orderservice {
@Override @Override
public BaseResponse queryInvoiceList(QueryInvoiceReq queryInvoiceReq) { public BaseResponse queryInvoiceList(QueryInvoiceReq queryInvoiceReq) {
ApiLog.printLog("queryInvoiceListqueryInvoiceReq1",JSON.toJSONString(queryInvoiceReq),null,null);
if(queryInvoiceReq.getSelectMonth() == null){ if(queryInvoiceReq.getSelectMonth() == null){
queryInvoiceReq.setStartTime(DateUtil.addMonths(new Date(),-2));//如果前端传null,聚合往前2个月 queryInvoiceReq.setStartTime(DateUtil.addMonths(new Date(),-2));//如果前端传null,聚合往前2个月
queryInvoiceReq.setEndTime(new Date());//如果前端传null,聚合当前时间 queryInvoiceReq.setEndTime(new Date());//如果前端传null,聚合当前时间
...@@ -4383,7 +4385,9 @@ public class OrderServiceImpl implements Orderservice { ...@@ -4383,7 +4385,9 @@ public class OrderServiceImpl implements Orderservice {
queryInvoiceReq.setStartTime(DateUtil.convert2Date(queryInvoiceReq.getSelectMonth()+"-01",DateUtil.FORMAT_YMD));//yyyy-MM拼接-01 queryInvoiceReq.setStartTime(DateUtil.convert2Date(queryInvoiceReq.getSelectMonth()+"-01",DateUtil.FORMAT_YMD));//yyyy-MM拼接-01
queryInvoiceReq.setEndTime((DateUtil.addMonths(DateUtil.convert2Date(queryInvoiceReq.getSelectMonth()+":01",DateUtil.FORMAT_YMD),1)));////yyyy-(MM+1)拼接下月-01 queryInvoiceReq.setEndTime((DateUtil.addMonths(DateUtil.convert2Date(queryInvoiceReq.getSelectMonth()+":01",DateUtil.FORMAT_YMD),1)));////yyyy-(MM+1)拼接下月-01
} }
ApiLog.printLog("queryInvoiceListqueryInvoiceReq2",JSON.toJSONString(queryInvoiceReq),null,null);
QueryInvoiceRepDto queryInvoiceRepDto = orderClient.queryInvoiceList(queryInvoiceReq); QueryInvoiceRepDto queryInvoiceRepDto = orderClient.queryInvoiceList(queryInvoiceReq);
ApiLog.printLog("queryInvoiceListqueryInvoiceRepDto",JSON.toJSONString(queryInvoiceRepDto),null,null);
if(queryInvoiceRepDto == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, queryInvoiceRepDto.getCode())){ if(queryInvoiceRepDto == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, queryInvoiceRepDto.getCode())){
return ResponseUtil.error(ResponseResult.QUERY_INVOICE_ERR); return ResponseUtil.error(ResponseResult.QUERY_INVOICE_ERR);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment