username@email.com
2021-12-15 d32ac8cd4de461a2b6cdfc0d21ca77df44334c89
撤单退回金额
3个文件已修改
57 ■■■■■ 已修改文件
zhengcaioa/IServices/IFiAccountRecordService.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/Services/FiAccountRecordService.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhengcaioa/IServices/IFiAccountRecordService.cs
@@ -15,6 +15,6 @@
        ResultEntity ModifyStatus(string id, string userid);
        List<FiAccountRecordDTO> GetList();
        List<FiAccountRecordDTO> GetList(string OperationalMatters = null);
    }
}
zhengcaioa/Services/FiAccountRecordService.cs
@@ -201,12 +201,17 @@
        /// 获取所有有效角色
        /// </summary>
        /// <returns></returns>
        public List<FiAccountRecordDTO> GetList()
        public List<FiAccountRecordDTO> GetList(string OperationalMatters = null)
        {
            var listPosition = _context.FiAccountRecords.Where(r => r.RecStatus == "A" ).ToList();
            if (!string.IsNullOrEmpty(OperationalMatters))
            {
                listPosition = listPosition.Where(x => x.OperationalMatters == OperationalMatters).ToList();
            }
            var list = _mapper.Map<List<FiAccountRecordDTO>>(listPosition);
            return list;
        }
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -44,6 +44,9 @@
        private readonly IAdmGoodsRecordService _admGoodsRecordService;
        private readonly IAdmGoodsManageService _admGoodsManageService;
        private readonly IFiOrderrecievemoneyService _fiOrderrecievemoneyService;
        private readonly IFiAccountService _fiAccountService;
        private readonly IFiAccountRecordService _iFiAccountRecordService;
        public CooperOrderController(ILogger<CooperOrderController> logger, ILiaotianService liaotianService, IUserService userService, ICooperOrderService cooperOrderService
@@ -54,6 +57,9 @@
            , IAskService askService
            , IAdmGoodsRecordService admGoodsRecordService
            , IAdmGoodsManageService admGoodsManageService
            , IFiOrderrecievemoneyService fiOrderrecievemoneyService
            , IFiAccountService fiAccountService
            , IFiAccountRecordService iFiAccountRecordService
            )
        {
            _logger = logger;
@@ -71,6 +77,9 @@
            _askService = askService;
            _admGoodsRecordService = admGoodsRecordService;
            _admGoodsManageService = admGoodsManageService;
            _fiOrderrecievemoneyService = fiOrderrecievemoneyService;
            _fiAccountService = fiAccountService;
            _iFiAccountRecordService = iFiAccountRecordService;
        }
        [CheckLogin]
@@ -1113,6 +1122,45 @@
                dto.ShouliStatus = "0";
                resultEntity = _cooperOrderService.chedan(dto);
                var fiAccountRecordDTOs = _iFiAccountRecordService.GetList("订单收款"+dto.OrderNo);
                if (fiAccountRecordDTOs!= null && fiAccountRecordDTOs.Count > 0)
                {
                    foreach (var fiAccountRecordDTO in fiAccountRecordDTOs)
                    {
                        CooperatecustomCustomerDTO cooperatecustomCustomerDTO = _cooperatecustomCustomerService.Get(dto.Khdw);
                        FiAccountRecordDTO data1 = new FiAccountRecordDTO();
                        data1.RecStatus = "A";
                        data1.Creater = curentuser.Id;
                        data1.Createtime = DateTime.Now;
                        data1.Modifier = curentuser.Id;
                        data1.Modifytime = DateTime.Now;
                        data1.SubjectId = fiAccountRecordDTO.SubjectId;
                        data1.AccountId = fiAccountRecordDTO.AccountId;
                        data1.Money = fiAccountRecordDTO.Money;
                        data1.PaymentUnit = cooperatecustomCustomerDTO.Name;
                        data1.OperationalMatters = "订单撤单" + dto.OrderNo;
                        FiAccountDTO firmAccount = _fiAccountService.Get(data1.AccountId);
                        data1.RecordTypeId = "2";//退款
                        data1.Department = "";
                        firmAccount.AllExpenses = (firmAccount.AllExpenses ?? 0) + fiAccountRecordDTO.Money;
                        firmAccount.Balance = (firmAccount.Balance ?? 0) - fiAccountRecordDTO.Money;
                        data1.AccountMoney = firmAccount.Balance;
                        resultEntity = _iFiAccountRecordService.save(data1);
                        resultEntity = _fiAccountService.save(firmAccount);
                    }
                }
                scope.Complete();
            }
            return new JsonResult(resultEntity);