Explorar el Código

销售退货-》作废添加退款

koushanshan hace 1 año
padre
commit
9b0fb4da7f

+ 8 - 0
src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.java

@@ -97,5 +97,13 @@ public interface RecPayMapper extends BaseMapper<RecPay> {
      * @date : 2024-02-28 10:19
      */
     Long getRpSupListCount(RecPayQuery recPayQuery);
+
+    /**
+     * @desc   : 根据条件查询
+     * @date   : 2024/7/16 17:13
+     * @author : 寇珊珊
+     */
+    RecPayResponse selectMessageByOtherCondition(RecPayQuery recPayQuery);
+
 }
 

+ 8 - 0
src/main/java/com/dk/mdm/mapper/mac/RecPayMapper.xml

@@ -861,4 +861,12 @@
             )
         </if>
     </select>
+
+
+    <!--根据条件查询-->
+    <select id="selectMessageByOtherCondition" resultMap="BaseResultMapResponse">
+        select t.rp_id
+        from dkic_b.t_mac_rec_pay as t
+        where t.biznis_id = #{biznisId}::uuid
+    </select>
 </mapper>

+ 16 - 1
src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleReturnService.java

@@ -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);