Commit ac5e797c authored by liao_ds's avatar liao_ds

售后-退货-废弃发票

parent 9e53e4dd
...@@ -234,12 +234,6 @@ public class ReturnGoodsDO implements Serializable { ...@@ -234,12 +234,6 @@ public class ReturnGoodsDO implements Serializable {
private String returnLogisticsNo; private String returnLogisticsNo;
/** /**
* 是否需要发票:0-否,1-是
*/
@Column(columnDefinition = "int")
private Integer needInvoice;
/**
*订单类型(OrderConstant.OrderType) *订单类型(OrderConstant.OrderType)
*/ */
@Column(columnDefinition = "int") @Column(columnDefinition = "int")
...@@ -253,14 +247,6 @@ public class ReturnGoodsDO implements Serializable { ...@@ -253,14 +247,6 @@ public class ReturnGoodsDO implements Serializable {
this.orderType = orderType; this.orderType = orderType;
} }
public Integer getNeedInvoice() {
return needInvoice;
}
public void setNeedInvoice(Integer needInvoice) {
this.needInvoice = needInvoice;
}
public Long getReturnLogisticsId() { public Long getReturnLogisticsId() {
return returnLogisticsId; return returnLogisticsId;
} }
......
...@@ -40,7 +40,6 @@ import com.ssy.lingxi.message.api.vo.request.SystemMessageRequest; ...@@ -40,7 +40,6 @@ import com.ssy.lingxi.message.api.vo.request.SystemMessageRequest;
import com.ssy.lingxi.order.api.dto.request.AfterSalesListRequest; import com.ssy.lingxi.order.api.dto.request.AfterSalesListRequest;
import com.ssy.lingxi.order.api.dto.request.OrderProductDetailsUpdateRequest; import com.ssy.lingxi.order.api.dto.request.OrderProductDetailsUpdateRequest;
import com.ssy.lingxi.order.api.dto.request.OrderProductDetailsUpdateRequests; import com.ssy.lingxi.order.api.dto.request.OrderProductDetailsUpdateRequests;
import com.ssy.lingxi.order.api.dto.request.TheInvoiceOrderInfoResponse;
import com.ssy.lingxi.order.api.dto.response.OneBatchBrderListDetailsResponse; import com.ssy.lingxi.order.api.dto.response.OneBatchBrderListDetailsResponse;
import com.ssy.lingxi.pay.api.dto.request.WeChatRefundRequest; import com.ssy.lingxi.pay.api.dto.request.WeChatRefundRequest;
import com.ssy.lingxi.pay.api.dto.request.assetAccount.BalanceRefundRequest; import com.ssy.lingxi.pay.api.dto.request.assetAccount.BalanceRefundRequest;
...@@ -1026,9 +1025,9 @@ public class ReturnGoodsServiceImpl implements IReturnGoodsService { ...@@ -1026,9 +1025,9 @@ public class ReturnGoodsServiceImpl implements IReturnGoodsService {
returnDO.setCreateTime(System.currentTimeMillis()); returnDO.setCreateTime(System.currentTimeMillis());
returnDO.setUpdateTime(0L); returnDO.setUpdateTime(0L);
returnDO.setOrderType(saveVO.getOrderType()); returnDO.setOrderType(saveVO.getOrderType());
// 设置是否需要发票 /*废弃:731 // 设置是否需要发票
returnDO.setNeedInvoice(CommonBooleanEnum.NO.getCode()); returnDO.setNeedInvoice(CommonBooleanEnum.NO.getCode());
List<String> orderNoList = saveVO.getReturnGoodsList().stream().map(ReturnGoodsDetailSaveVO::getOrderNo).distinct().collect(Collectors.toList()); List<String> orderNoList = saveVO.getReturnGoodsList().stream().map(ReturnGoodsDetailSaveVO::getOrderNo).distinct().collect(Collectors.toList());
for (String orderNO : orderNoList) { for (String orderNO : orderNoList) {
Wrapper<TheInvoiceOrderInfoResponse> wrapper = feignService.mergeOrderInvoice(orderNO); Wrapper<TheInvoiceOrderInfoResponse> wrapper = feignService.mergeOrderInvoice(orderNO);
if (null != wrapper && ResponseCode.SUCCESS.getCode() == wrapper.getCode() if (null != wrapper && ResponseCode.SUCCESS.getCode() == wrapper.getCode()
...@@ -1036,7 +1035,7 @@ public class ReturnGoodsServiceImpl implements IReturnGoodsService { ...@@ -1036,7 +1035,7 @@ public class ReturnGoodsServiceImpl implements IReturnGoodsService {
returnDO.setNeedInvoice(CommonBooleanEnum.YES.getCode()); returnDO.setNeedInvoice(CommonBooleanEnum.YES.getCode());
break; break;
} }
} }*/
return returnDO; return returnDO;
} }
......
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