|
|
@@ -18,6 +18,7 @@ import com.dk.mdm.mapper.ivt.InboundItemMapper;
|
|
|
import com.dk.mdm.mapper.ivt.OutboundItemMapper;
|
|
|
import com.dk.mdm.mapper.ivt.OutboundMapper;
|
|
|
import com.dk.mdm.mapper.mac.AccountMapper;
|
|
|
+import com.dk.mdm.mapper.mac.RecPayMapper;
|
|
|
import com.dk.mdm.mapper.mst.MoneyAccountMapper;
|
|
|
import com.dk.mdm.mapper.sale.OrderItemMapper;
|
|
|
import com.dk.mdm.mapper.sale.OrderMapper;
|
|
|
@@ -29,10 +30,12 @@ import com.dk.mdm.model.pojo.sale.OrderItem;
|
|
|
import com.dk.mdm.model.query.ivt.InboundItemQuery;
|
|
|
import com.dk.mdm.model.query.ivt.OutboundItemQuery;
|
|
|
import com.dk.mdm.model.query.ivt.OutboundQuery;
|
|
|
+import com.dk.mdm.model.query.mac.RecPayQuery;
|
|
|
import com.dk.mdm.model.response.ivt.InboundItemResponse;
|
|
|
import com.dk.mdm.model.response.ivt.OutboundItemResponse;
|
|
|
import com.dk.mdm.model.response.ivt.OutboundResponse;
|
|
|
import com.dk.mdm.model.response.mac.AccountResponse;
|
|
|
+import com.dk.mdm.model.response.mac.RecPayResponse;
|
|
|
import com.dk.mdm.model.response.mst.MoneyAccountResponse;
|
|
|
import com.dk.mdm.model.response.sale.OrderItemResponse;
|
|
|
import com.dk.mdm.model.response.sale.OrderResponse;
|
|
|
@@ -117,6 +120,9 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
|
|
|
@Autowired
|
|
|
private CustomerService customerService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private RecPayMapper recPayMapper;
|
|
|
+
|
|
|
/**
|
|
|
* @desc : 修改原总单数据(订单,出库单)
|
|
|
* @date : 2024/3/29 10:43
|
|
|
@@ -356,6 +362,8 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
|
|
|
recPayVO.setRpType(outboundVO.getRpType());
|
|
|
recPayVO.setSumAmtRec(outboundVO.getSumAmtRec());
|
|
|
recPayVO.setItemList(outboundVO.getItemListRecPayItemVO());
|
|
|
+ recPayVO.setBiznisId(outboundVO.getOutId());
|
|
|
+ recPayVO.setBiznisNo(outboundVO.getOutNo());
|
|
|
receiptService.insertRefund(recPayVO);
|
|
|
return ResponseResultUtil.success();
|
|
|
}
|
|
|
@@ -527,7 +535,7 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
|
|
|
this.updatePrimaryTotal(outboundVO);
|
|
|
//endregion
|
|
|
|
|
|
- //region 账款
|
|
|
+ //region 记账
|
|
|
if (Constant.OutStatus.YICHUKU.getName().equals(outboundVO.getOutStatus())) {
|
|
|
accountService.accReceivable(outboundVO.getOutId(), Constant.InventoryDocCode.OUTBOUND.getTableName());
|
|
|
}
|
|
|
@@ -855,6 +863,13 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
|
|
|
}
|
|
|
//endregion
|
|
|
|
|
|
+ //region 退款
|
|
|
+ RecPayResponse recPayResponse = recPayMapper.selectMessageByOtherCondition(new RecPayQuery().setBiznisId(outboundResponse.getOutId()));
|
|
|
+ if(recPayResponse!=null ){
|
|
|
+ receiptService.invalid(recPayResponse.getRpId());
|
|
|
+ }
|
|
|
+ //endregion
|
|
|
+
|
|
|
//region 回滚原总单和明细信息(订单,出库单)
|
|
|
List<OutboundItemVO> outboundItemVOList = outboundItemConvert.convertResListToVOList(outboundItemResponseList);
|
|
|
this.rollBackTotalAndDetail(outboundItemVOList);
|