|
@@ -18,6 +18,10 @@ import com.fs.his.dto.FsStoreCartDTO;
|
|
|
import com.fs.his.mapper.FsStoreAfterSalesMapper;
|
|
|
import com.fs.his.mapper.FsStoreOrderMapper;
|
|
|
import com.fs.his.service.IFsStoreOrderItemService;
|
|
|
+import com.fs.hisStore.domain.FsStoreOrderItemScrm;
|
|
|
+import com.fs.hisStore.domain.FsStoreOrderScrm;
|
|
|
+import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
|
|
|
+import com.fs.hisStore.service.IFsStoreOrderItemScrmService;
|
|
|
import com.fs.ybPay.dto.RefundOrderDTO;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
//import org.apache.commons.lang3.StringUtils;
|
|
@@ -41,10 +45,10 @@ public class FsJstAftersalePushServiceImpl implements FsJstAftersalePushService
|
|
|
private JstErpHttpService jstErpHttpService;
|
|
|
|
|
|
@Autowired
|
|
|
- private FsStoreOrderMapper fsStoreOrderMapper;
|
|
|
+ private FsStoreOrderScrmMapper fsStoreOrderMapper;
|
|
|
|
|
|
@Autowired
|
|
|
- private IFsStoreOrderItemService storeOrderItemService;
|
|
|
+ private IFsStoreOrderItemScrmService storeOrderItemService;
|
|
|
|
|
|
@Autowired
|
|
|
private FsStoreAfterSalesMapper fsStoreAfterSalesMapper;
|
|
@@ -63,7 +67,7 @@ public class FsJstAftersalePushServiceImpl implements FsJstAftersalePushService
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(item.getOrderId());
|
|
|
+ FsStoreOrderScrm fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(item.getOrderId());
|
|
|
|
|
|
item.setRetryCount(item.getRetryCount()+1);
|
|
|
|
|
@@ -135,7 +139,7 @@ public class FsJstAftersalePushServiceImpl implements FsJstAftersalePushService
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private RefundOrderDTO getAfterSaleDTO(FsJstAftersalePush item, FsStoreOrder fsStoreOrder) {
|
|
|
+ private RefundOrderDTO getAfterSaleDTO(FsJstAftersalePush item, FsStoreOrderScrm fsStoreOrder) {
|
|
|
RefundOrderDTO dto = new RefundOrderDTO();
|
|
|
AfterSalesOrderStatusEnum statusEnum = AfterSalesOrderStatusEnum.getByIndex(Integer.valueOf(item.getType()));
|
|
|
|
|
@@ -151,13 +155,13 @@ public class FsJstAftersalePushServiceImpl implements FsJstAftersalePushService
|
|
|
dto.setRefund(fsStoreOrder.getPayMoney());
|
|
|
|
|
|
|
|
|
- FsStoreOrderItem itemMap=new FsStoreOrderItem();
|
|
|
+ FsStoreOrderItemScrm itemMap=new FsStoreOrderItemScrm();
|
|
|
// itemMap.setOrderId(fsStoreOrder.getId());
|
|
|
- itemMap.setOrderId(fsStoreOrder.getOrderId());
|
|
|
- List<FsStoreOrderItem> orderItems=storeOrderItemService.selectFsStoreOrderItemList(itemMap);
|
|
|
+ itemMap.setOrderId(fsStoreOrder.getId());
|
|
|
+ List<FsStoreOrderItemScrm> orderItems=storeOrderItemService.selectFsStoreOrderItemList(itemMap);
|
|
|
List<RefundItemDTO> refundItemDTOS=new ArrayList<>();
|
|
|
|
|
|
- for(FsStoreOrderItem orderItem: orderItems) {
|
|
|
+ for(FsStoreOrderItemScrm orderItem: orderItems) {
|
|
|
FsStoreCartDTO cartDTO = JSONUtil.toBean(orderItem.getJsonInfo(), FsStoreCartDTO.class);
|
|
|
|
|
|
RefundItemDTO itemDTO = new RefundItemDTO();
|