风险代理确认订单后计算业绩

username@email.com

2022-08-29 c06eb4d284a80dbee4a2d040046c37bf73dcfcd5

风险代理确认订单后计算业绩

 zhengcaioa/Services/CooperOrderService.cs

@@ -78,8 +78,9 @@
                    updateproject.Shoulitime = entity.Shoulitime;
                    updateproject.Songhuoer = entity.Songhuoer;
                    updateproject.Songhuotime = entity.Songhuotime;
                    updateproject.Wangonger = entity.Wangonger;
                    updateproject.Wangongtime = entity.Wangongtime;
                    //updateproject.WangongStatus = entity.WangongStatus;
                    //updateproject.Wangonger = entity.Wangonger;
                    //updateproject.Wangongtime = entity.Wangongtime;

                    updateproject.RecStatus = entity.RecStatus;
                    updateproject.Modifier = entity.Modifier;
@@ -441,7 +442,7 @@
                updateproject.WangongStatus = dto.WangongStatus;
                updateproject.Wangonger = dto.Wangonger;
                updateproject.Wangongtime = dto.Wangongtime;

                updateproject.ShouliStatus = dto.ShouliStatus;


                _context.SaveChanges();
@@ -758,7 +759,7 @@
        public List<CooperOrderDTO> GetList(string userid, DateTime datemin, DateTime datemax)
        {

            var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax).ToList();
            var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && ((x.OrderType != "08" && x.Createtime >= datemin && x.Createtime < datemax) || (x.OrderType == "08" && x.WangongStatus == "A" && x.Wangongtime >= datemin && x.Wangongtime < datemax)) ).ToList();



@@ -790,7 +791,7 @@



            var entity = (from a in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax)
            var entity = (from a in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && ( (x.OrderType != "08" && x.Createtime >= datemin && x.Createtime < datemax) || (x.OrderType == "08" &&  x.WangongStatus=="A" &&  x.Wangongtime >= datemin && x.Wangongtime < datemax)))

                                          join b in listCode.Where(x => x.CodeTable == "CooperOrder" && x.CodeField == "shouli_status")
                                         on a.ShouliStatus equals b.CodeSn

 zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs

@@ -1324,9 +1324,10 @@
            //dto.Id = id;
            dto.Wangonger = curentuser.Id;
            dto.Wangongtime = DateTime.Now;
            dto.WangongStatus = "A";
            dto.ShouliStatus = "4";

            ResultEntity resultEntity = _cooperOrderService.save(dto);
            ResultEntity resultEntity = _cooperOrderService.Wangong(dto);

            return new JsonResult(resultEntity);
        }

 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

@@ -990,7 +990,7 @@
                }
                catch (Exception ex)
                {

                    zhucehuiyuanDTO.benyueshuliang = "0";
                }
                //var zhucehuiyuansyue = _admPieceCheckService.GetList(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();

@@ -1270,7 +1270,7 @@
            var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;

            //本日数量
            var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            var dingdanDTOsri = dingdanDTOsyue.Where(x =>( x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)) || (x.Wangongtime >= chauxnshijian.Date && x.Wangongtime < chauxnshijian.Date.AddDays(1)) ).ToList();
            foreach (var cooperOrderDTO in dingdanDTOsri)
            {
                TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
@@ -2751,7 +2751,7 @@
                        }
                        catch (Exception ex)
                        {

                            zhucehuiyuanDTO.benyueshuliang = "0";
                        }


@@ -3026,7 +3026,7 @@
                    var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;

                    //本日数量
                    var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    var dingdanDTOsri = dingdanDTOsyue.Where(x => (x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)) || (x.Wangongtime >= chauxnshijian.Date && x.Wangongtime < chauxnshijian.Date.AddDays(1))).ToList();
                    foreach (var cooperOrderDTO in dingdanDTOsri)
                    {
                        TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();

 zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml

@@ -35,7 +35,7 @@
                shoulibool = false;
            } else if (pageEntitiesJson[i].PageName == "撤单") {
                chedanbool = false;
            } else if (pageEntitiesJson[i].PageName == "完工") {
            } else if (pageEntitiesJson[i].PageName == "确认订单") {
                wangongbool = false;
            } else if (pageEntitiesJson[i].PageName == "送货") {
                songhuobool = false;
@@ -55,10 +55,15 @@
            {
                label: '订单号', name: 'OrderNo', labtype: 'txt', hidden: false, width: 100,
                formatter: function (cellvalue, options, rowObject) {
                    var color = "";
                    if (rowObject.OrderType == '08') {
                        color = "red";
                    }  

                    if (rowObject.ShouliStatus == "A") {
                        return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\"  >" + cellvalue + "</a>";
                        return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\"  ><span style='color:" + color + ";'>" + cellvalue + "</span></a>";
                    } else {
                        return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\"  >" + cellvalue + "</a>";
                        return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&ShouliStatus=" + rowObject.ShouliStatus + "')\"  ><span style='color:" + color + ";'>" + cellvalue + "</span></a>";
                    }

                }
@@ -111,15 +116,15 @@
                }
            },
            {
                label: '完工', name: 'WangongStatusName', labtype: 'txt', hidden: true, width: 60,
                label: '确认订单', name: 'WangongStatusName', labtype: 'txt', hidden: false, width: 60,
                formatter: function (cellvalue, options, rowObject) {
                    if (rowObject.ShouliStatus == '4' || rowObject.ShouliStatus == '5'  ) {
                    if (rowObject.WangongStatus == 'A' ) {
                        return "√";
                    } else {
                        if (rowObject.ShouliStatus == '1' || rowObject.ChedanStatus == 'A') {
                        if (rowObject.ShouliStatus == '1' || rowObject.ChedanStatus == 'A' || rowObject.OrderType != '08' ) {
                            return "";
                        } else {
                            return "<a onclick=\"wangong('" + rowObject.Id + "')\"  >完工</a>";
                            return "<a onclick=\"wangong('" + rowObject.Id + "')\"  >确认订单</a>";
                        }

                    }
@@ -385,7 +390,7 @@
            var index = layer.open({
                type: 1,　　//基本层类型
                icon: 0, //图标
                content: '确认完工？',   //内容
                content: '确认订单？',   //内容
                shade: 0.3,  //遮罩,如果想定义别的颜色,可以shade:[0.5,'#fff']
                shadeClose: 1,   //是否点击遮罩关闭
                skin: 'demoClass',    //样式类名
@@ -404,16 +409,16 @@
                        success: function (data) {

                            if (data.Result) {
                                toastr.success("完工成功");
                                toastr.success("确认订单");
                                window._reloadPageData();
                            } else {
                                toastr.error("完工失败" + data.Message);
                                toastr.error("确认订单失败" + data.Message);
                            }
                        },
                        error: function () {


                            toastr.error("完工失败");
                            toastr.error("确认订单失败");
                        }
                    });
                },