|
@@ -152,15 +152,15 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
switch (customerInfo.getCustomerIsSolve()) {
|
|
|
case 3:
|
|
|
|
|
|
- customerService.chargebackEfastOrder(customerCommon,salesOrder,2);
|
|
|
-
|
|
|
- map = customerService.sendEfastOrder(customerCommon,salesOrder);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);
|
|
|
+
|
|
|
+
|
|
|
if(map.get("status") == 1){
|
|
|
customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));
|
|
|
complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));
|
|
|
}else{
|
|
|
throw new RuntimeException("换新创建Efast订单失败");
|
|
|
- }
|
|
|
+ }*/
|
|
|
complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());
|
|
|
customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);
|
|
|
complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());
|
|
@@ -168,15 +168,15 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
break;
|
|
|
case 4:
|
|
|
|
|
|
- customerService.chargebackEfastOrder(customerCommon,salesOrder,2);
|
|
|
-
|
|
|
- map = customerService.sendEfastOrder(customerCommon,salesOrder);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);
|
|
|
+
|
|
|
+
|
|
|
if(map.get("status") == 1){
|
|
|
customerCommon.setRelationBackEfastOrderId(String.valueOf(map.get("EfastOrderId")));
|
|
|
complaintSignclosedInfo.setNewEfastId(String.valueOf(map.get("EfastOrderId")));
|
|
|
}else{
|
|
|
throw new RuntimeException("维修创建Efast订单失败");
|
|
|
- }
|
|
|
+ }*/
|
|
|
complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());
|
|
|
customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);
|
|
|
complaintDetectInfo.setSignclosedId(complaintSignclosedInfo.getSignclosedId());
|
|
@@ -193,7 +193,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
break;
|
|
|
case 6:
|
|
|
|
|
|
- customerService.chargebackEfastOrder(customerCommon,salesOrder,3);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);
|
|
|
|
|
|
complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());
|
|
|
customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);
|
|
@@ -202,7 +202,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
break;
|
|
|
case 7:
|
|
|
|
|
|
- customerService.chargebackEfastOrder(customerCommon,salesOrder,3);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);
|
|
|
|
|
|
complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());
|
|
|
customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);
|
|
@@ -341,7 +341,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
boolean isReturn = false;
|
|
|
switch (customerInfo.getCustomerIsSolve()) {
|
|
|
case 3:
|
|
|
- customerService.chargebackEfastOrder(customerCommon,salesOrder,2);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);
|
|
|
|
|
|
map = customerService.sendEfastOrder(customerCommon,salesOrder);
|
|
|
if(map.get("status") == 1){
|
|
@@ -357,7 +357,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
break;
|
|
|
case 4:
|
|
|
|
|
|
- customerService.chargebackEfastOrder(customerCommon,salesOrder,2);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon,salesOrder,2,2);
|
|
|
|
|
|
map = customerService.sendEfastOrder(customerCommon,salesOrder);
|
|
|
if(map.get("status") == 1){
|
|
@@ -382,7 +382,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
break;
|
|
|
case 6:
|
|
|
|
|
|
- customerService.chargebackEfastOrder(customerCommon,salesOrder,3);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);
|
|
|
|
|
|
complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());
|
|
|
customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);
|
|
@@ -391,7 +391,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
break;
|
|
|
case 7:
|
|
|
|
|
|
- customerService.chargebackEfastOrder(customerCommon,salesOrder,3);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon,salesOrder,3,1);
|
|
|
|
|
|
complaintSignclosedInfo.setOldEfastId(salesOrder.getSalesOrderId());
|
|
|
customerService.saveComplaintSignclosedInfo(complaintSignclosedInfo,customerCommon);
|
|
@@ -502,7 +502,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
record.setRelationId(renewed.getRenewedId());
|
|
|
customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(record));
|
|
|
customerService.setName(customerCommon);
|
|
|
- customerService.chargebackEfastOrder(customerCommon,salesOrder,8);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon,salesOrder,8,2);
|
|
|
}
|
|
|
|
|
|
closedRecord.setRelationId(renewed.getRenewedId());
|
|
@@ -528,7 +528,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
record.setRelationId(repair.getRepairId());
|
|
|
customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(record));
|
|
|
customerService.setName(customerCommon);
|
|
|
- customerService.chargebackEfastOrder(customerCommon, salesOrder, 8);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon, salesOrder, 8,2);
|
|
|
}
|
|
|
|
|
|
closedRecord.setRelationId(repair.getRepairId());
|
|
@@ -554,7 +554,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
record.setRelationId(reissue.getReissueId());
|
|
|
customerCommon.setSendProdcues(sendProdcueMapper.listSendProdcue(record));
|
|
|
customerService.setName(customerCommon);
|
|
|
- customerService.chargebackEfastOrder(customerCommon, salesOrder, 8);
|
|
|
+ customerService.chargebackEfastOrder(customerCommon, salesOrder, 8,2);
|
|
|
}
|
|
|
|
|
|
sendProdcue.setRelationId(reissue.getReissueId());
|
|
@@ -959,7 +959,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
* @throws RuntimeException
|
|
|
*/
|
|
|
@Transactional
|
|
|
- public void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status){
|
|
|
+ public void chargebackEfastOrder(CustomerCommon customerCommon, SalesOrder salesOrder,Integer status,Integer returnType){
|
|
|
|
|
|
SalesOrder order = new SalesOrder();
|
|
|
order.setSalesId(salesOrder.getSalesId());
|
|
@@ -984,7 +984,7 @@ public class CustomerServiceImpl implements CustomerService {
|
|
|
efastOrder.setOrderPostNum(salesOrder.getSalesPostNum());
|
|
|
efastOrder.setOrderId(salesOrder.getSalesOrderId());
|
|
|
efastOrder.setItemList(itemList);
|
|
|
-
|
|
|
+ efastOrder.setReturnOrderType(returnType);
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
try{
|
|
|
jsonObject = efastOrderService.returnOrderFormEfast(efastOrder);
|