luminghui
/
sdny-order
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0906-edit' into test

Browse Source 
# Conflicts:
#	order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/model/GroupManagementEntityVO.java
#	order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
release
wangrangrang 2 years ago
parent 2cf1d714bc 1f012bf563
commit 371eb3cbc0
6 changed files with 37 additions and 48 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java
  2. 2
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java
  3. 51
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
  4. 15
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
  5. 3
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java
  6. 13
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

1
order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java
Unescape View File

@ -55,5 +55,4 @@ public interface GroupManagementService {
* 查询所有组织信息
*/
List<GroupManagementEntityVO> findAllGroupInfo();
}

2
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/PushInvoiceService.java
Unescape View File

@ -71,7 +71,7 @@ public interface PushInvoiceService {
public R processPushFail(CommonTsMqData commonTsMqData, String pushUrl, String msg, List<String> shList);
public R sendImageSys(String content, String pushType, PushInfo pushInfo, Long id);
public void sendImageSys(String content, String pushType, PushInfo pushInfo, Long id);
public void successPush(Long pushInfoRecordId,String content,String result,PushInfo pushInfo,String pushtype);

51
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/PushInvoiceServiceImpl.java
Unescape View File

@ -17,6 +17,7 @@ import com.dxhy.order.consumer.dao.GsClientMapper;
import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper;
import com.dxhy.order.consumer.dao.PushInfoRecordMapper;
import com.dxhy.order.consumer.model.PushInfoRecord;
import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper;
import com.dxhy.order.consumer.model.protocol.CommonResponse;
import com.dxhy.order.consumer.model.protocol.ResponseData;
import com.dxhy.order.consumer.model.protocol.ResponseStatus;
@ -173,10 +174,10 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
private BaseServiceConfig baseServiceConfig;
@Resource
private InterfaceRequestDataMapper interfaceRequestDataMapper;
private PushInfoRecordMapper pushInfoRecordMapper;
@Resource
private PushInfoRecordMapper pushInfoRecordMapper;
private InterfaceRequestDataMapper interfaceRequestDataMapper;
@Resource
private GsClientMapper gsClientMapper;
@ -700,9 +701,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
return r;
}
@Override
public R sendImageSys(String content, String pushType, PushInfo pushInfo, Long id) {
R r = new R();
public void sendImageSys(String content, String pushType, PushInfo pushInfo, Long id){
PushInfo pushInfo1 = new PushInfo();
pushInfo1.setId(pushInfo.getId());
pushInfo1.setByzd1("YXXT");
@ -712,55 +711,51 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
DdfpxxV5 ddfpxx = ddfpzxxV5.getDDFPXX();
OutputInvoiceRequest outputInvoiceRequest = buildInvoiceRequest(ddfpxx);
if (outputInvoiceRequest.getInvoiceList() != null && outputInvoiceRequest.getInvoiceList().size() > 0) {
if(outputInvoiceRequest.getInvoiceList() != null && outputInvoiceRequest.getInvoiceList().size() > 0){
String fplxdm = ddfpxx.getFPLXDM();
boolean b = OrderInfoEnum.ORDER_INVOICE_TYPE_001.getKey().equals(fplxdm)
|| OrderInfoEnum.ORDER_INVOICE_TYPE_002.getKey().equals(fplxdm)
|| OrderInfoEnum.ORDER_INVOICE_TYPE_026.getKey().equals(fplxdm)
|| OrderInfoEnum.ORDER_INVOICE_TYPE_028.getKey().equals(fplxdm);
if (!b) {
String error = String.format("invoiceNo：%s not eleInvoice do not push", outputInvoiceRequest.getInvoiceList().get(0).getInvoiceNumber());
if(!b){
String error=String.format("invoiceNo：%s not eleInvoice do not push",outputInvoiceRequest.getInvoiceList().get(0).getInvoiceNumber());
log.info(error);
failPush(id, content, error, error, pushInfo1, pushType);
r.put(OrderManagementConstant.CODE, "9999");
r.put(OrderManagementConstant.ALL_MESSAGE, error);
return r;
failPush(id,content,error,error,pushInfo1,pushType);
return;
}
}
try {
String md5Encode = MD5.getMd5Encode(outputInvoiceRequest.getBillNum() + invoiceConfig.getSapSalt());
String md5Encode = MD5.getMd5Encode(outputInvoiceRequest.getBillNum() + invoiceConfig.getSapSalt() );
Map<String, String> headerMap = Maps.newHashMap();
headerMap.put("Authorization", md5Encode);
headerMap.put("Authorization",md5Encode);
String param = JSONObject.toJSONString(outputInvoiceRequest);
if (StringUtils.isNotBlank(param) && param.length() > 400) {
param = param.substring(0, 400);
if(StringUtils.isNotBlank(param) && param.length() > 400){
param = param.substring(0,400);
}
log.info("call image check request url：{}，header：{}，parameter：{}", invoiceConfig.getSnYxUrl(), JSONObject.toJSONString(headerMap), param);
log.info("call image check request url：{}，header：{}，parameter：{}",invoiceConfig.getSnYxUrl(),JSONObject.toJSONString(headerMap),param);
String body = HttpRequest.post(invoiceConfig.getSnYxUrl()).addHeaders(headerMap).body(JSONObject.toJSONString(outputInvoiceRequest)).timeout(300000).execute().body();
log.info("call image check return parameter：{}", body);
log.info("call image check return parameter：{}",body);
JSONObject jsonObject = JSONObject.parseObject(body);
String status = jsonObject.getString("status");//200 成功、 500 失败
String message = jsonObject.getString("message");
String data = jsonObject.getString("data");
if ("200".equals(status)) {
if("200".equals(status)){
//成功
successPush(id, content, data, pushInfo1, pushType);
} else {
successPush(id,content,data,pushInfo1,pushType);
}else {
//失败
failPush(id, content, message, data, pushInfo1, pushType);
failPush(id,content,message,data,pushInfo1,pushType);
}
//暂时不保存状态
} catch (Exception e) {
String error = String.format("影像系统推送数据异常，%s ,推送类型为%s", e.getMessage(), pushType);
String error=String.format("影像系统推送数据异常，%s ,推送类型为%s",e.getMessage(),pushType);
log.error(error);
e.printStackTrace();
failPush(id, content, error, e.getMessage(), pushInfo1, pushType);
r.put(OrderManagementConstant.CODE, "9999");
r.put(OrderManagementConstant.ALL_MESSAGE, error);
return r;
failPush(id,content,error,e.getMessage(),pushInfo1,pushType);
return;
}
}
return r;
}

15
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java
Unescape View File

@ -5,13 +5,9 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
import com.dxhy.order.constant.*;
import com.dxhy.order.consumer.modules.order.model.dto.RewriteBzdhDTO;
import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO;
import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo;
import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO;
import com.dxhy.order.consumer.modules.order.service.OrderBzdhService;
import com.dxhy.order.exception.OrderReceiveException;
import com.dxhy.order.model.*;
import com.dxhy.order.model.page.OrderListQuery;
@ -36,11 +32,9 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.validation.constraints.NotBlank;
import java.util.*;
import java.util.regex.Matcher;
@ -167,14 +161,15 @@ public class OrderInfoController {
@ApiOperation(value = "发票列表", notes = "发票列表修改报账单号")
@SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理")
public R updateBillNumber(@RequestParam("bzdh") String bzdh,
@RequestParam("orderInfoId") String orderInfoId,
@RequestParam("fpqqlsh")String fpqqlsh,
@RequestParam("xhfNsrsbh")String xhfNsrsbh) {
@RequestParam("orderInfoId") String orderInfoId
// @RequestParam("fpqqlsh")String fpqqlsh,
// @RequestParam("xhfNsrsbh")String xhfNsrsbh
) {
if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){
return R.error("请求参数有误");
}
try {
int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh);
int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,"","");
if(i > 0){
return R.ok();
}

3
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/InvoicePushServiceImpl.java
Unescape View File

@ -98,7 +98,8 @@ public class InvoicePushServiceImpl implements InvoicePushService {
String pushType = pushInfoRecord.getInterfacePushType();
try {
//推送影像系统
r=pushInvoiceService.sendImageSys(pushInfoRecord.getPushContent(), pushType, pushInfo,pushInfoRecord.getId());
pushInvoiceService.sendImageSys(pushInfoRecord.getPushContent(), pushType, pushInfo,pushInfoRecord.getId());
r.put(OrderManagementConstant.CODE, "0000");
return r;
} catch (Exception e) {
String error = String.format("影像推送出现异常%s,推送类型%s", e.getMessage(), pushType);

13
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
Unescape View File

@ -64,7 +64,6 @@ import com.dxhy.order.model.qdsk.taxpayerinfo.Qdjcxx;
import com.dxhy.order.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -1757,12 +1756,12 @@ public class OrderInfoServiceImpl implements OrderInfoService {
orderProcessInfo.setBzdh(bzdh);
orderProcessInfo.setOrderInfoId(orderInfoId);
int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null);
if(i > 0) {
Map map = new HashMap();
map.put("ddqqlsh","");
map.put("xhfNsrsbh","");
invoiceDataService.manualPushInvoice(Arrays.asList(map));
}
// if(i > 0) {
// Map map = new HashMap();
// map.put("ddqqlsh","");
// map.put("xhfNsrsbh","");
// invoiceDataService.manualPushInvoice(Arrays.asList(map));
// }
return i;
}

Write Preview
Loading…
Cancel
Save