no message

liaoxujun@qq.com

2024-03-27 26f059f55124470a57554e0941d6be4cc72bbbdc

no message

 CoreCms.Net.Model/CoreCms.Net.Model.xml

File was deleted

 CoreCms.Net.Model/ViewModels/DTO/ProductDto.cs

@@ -92,6 +92,15 @@
        /// 
        /// </summary>
        public decimal price { get; set; }

        /// <summary>
        /// 商城定价
        /// </summary>
        public decimal selPrice { get; set; }
        /// <summary>
        /// 推荐零售价，市场价
        /// </summary>
        public decimal mktPrice { get; set; }
        /// <summary>
        /// 
        /// </summary>

 CoreCms.Net.Repository/Shop/CoreCmsStoreRepository.cs

@@ -87,25 +87,25 @@
                jm.msg = "不存在此信息";
                return jm;
            }
            //事物处理过程开始
            //事务处理过程开始
            oldModel.storeName = entity.storeName;
            oldModel.mobile = entity.mobile;
            oldModel.linkMan = entity.linkMan;
            oldModel.logoImage = entity.logoImage;
            oldModel.areaId = entity.areaId;
            oldModel.address = entity.address;
            oldModel.coordinate = entity.coordinate;
            //oldModel.coordinate = entity.coordinate;
            oldModel.latitude = entity.latitude;
            oldModel.longitude = entity.longitude;
            oldModel.updateTime = entity.updateTime;
            oldModel.isDefault = entity.isDefault;

            if (entity.coordinate.Contains(","))
            {
                var latlong = entity.coordinate.Split(",");
                oldModel.latitude = latlong[0];
                oldModel.longitude = latlong[1];
            }
            //if (entity.coordinate.Contains(","))
            //{
            //    var latlong = entity.coordinate.Split(",");
            //    oldModel.latitude = latlong[0];
            //    oldModel.longitude = latlong[1];
            //}

            var isDefaultObj = DbClient.Queryable<CoreCmsStore>().Where(p => p.isDefault == true).Any();
            if (isDefaultObj && entity.isDefault == true)

 CoreCms.Net.Services/Good/CoreCmsGoodsServices.cs

@@ -821,6 +821,8 @@
                    item.price = o.price - gradePrice; //减去会员等级价格
                    item.sku_name_arr = o.spesDesc.Split(",").Select(s => s.Split(":")[1]).ToList();
                    item.stock = o.stock;
                    item.mktPrice = o.mktprice;
                    item.selPrice = o.price;
                    if (type == GlobalEnumVars.OrderType.PinTuan.ToString().ToLowerInvariant())
                    {
                        if (isMaxPinTuanGoodsNums)
@@ -869,6 +871,8 @@
                    item.price = o.price - gradePrice; //减去会员等级价格
                    item.sku_name_arr = new List<string> { "默认" };
                    item.stock = o.stock;
                    item.mktPrice = o.mktprice;
                    item.selPrice = o.price;
                    if (type == GlobalEnumVars.OrderType.PinTuan.ToString().ToLowerInvariant())
                    {
                        if (isMaxPinTuanGoodsNums)

 CoreCms.Net.Web.Admin/wwwroot/views/distribution/distributor/edit.html

@@ -3,7 +3,7 @@
 * @Author: 小飞侠
 * @Date: 2024-02-28 13:48:49
 * @LastEditors: Please set LastEditors
 * @LastEditTime: 2024-03-06 11:35:53
 * @LastEditTime: 2024-03-27 13:03:32
 * Copyright: 2024  MinTinge CO.,LTD. All Rights Reserved.
 * @Descripttion: 写入你的描述
-->
@@ -11,7 +11,7 @@
    <div class="layui-form coreshop-form layui-form-pane" lay-filter="LAY-app-CoreCmsDistribution-editForm" id="LAY-app-CoreCmsDistribution-editForm">
        <input type="hidden" name="id" value="{{d.params.data.model.id || '' }}" />
        <input type="hidden" name="userId" value="{{d.params.data.model.userId || '' }}" />

      
        <div class="layui-form-item">
            <label for="name" class="layui-form-label  layui-form-required">经销商名称</label>
            <div class="layui-input-inline">

 CoreCms.Net.Web.Admin/wwwroot/views/good/goods/create.html

@@ -316,7 +316,7 @@
                                                </div>
                                            </div>
                                            <div class="layui-form-item">
                                                <label class="layui-form-label">市场价</label>
                                                <label class="layui-form-label">指导零售价</label>
                                                <div class="layui-input-inline layui-inline-2">
                                                    <input class="layui-input" id="oneKeySetMktPrice">
                                                </div>
@@ -455,7 +455,7 @@
                <th>库存</th>
                <th><i class="required-color">*</i>销售价</th>
                <th>成本价</th>
                <th>市场价</th>
                <th>指导零售价</th>
                <th>经销商返现</th>
                <!-- <th>二级返现</th>
                <th>三级返现</th> -->
@@ -515,7 +515,7 @@
                    <input type="text" name="product[costprice][]" value="{{item.costprice}}" placeholder="成本价" class="layui-input layui-inline-1">
                </td>
                <td>
                    <input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="市场价" class="layui-input layui-inline-1">
                    <input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="指导零售价" class="layui-input layui-inline-1">
                </td>
                <td>
                    <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="经销商返现" class="layui-input layui-inline-1">

 CoreCms.Net.Web.Admin/wwwroot/views/good/goods/details.html

@@ -208,7 +208,7 @@
                <th>库存</th>
                <th><i class="required-color">*</i>销售价</th>
                <th>成本价</th>
                <th>市场价</th>
                <th>指导零售价</th>
                <th>一级返现</th>
                <th>二级返现</th>
                <th>三级返现</th>

 CoreCms.Net.Web.Admin/wwwroot/views/good/goods/edit.html

@@ -317,7 +317,7 @@
                <th>库存</th>
                <th><i class="required-color">*</i>销售价</th>
                <th>成本价</th>
                <th>市场价</th>
                <th>指导零售价</th>
                <th>一级返现</th>
                <!-- <th>二级返现</th>
                <th>三级返现</th> -->
@@ -378,7 +378,7 @@
                    <input type="text" name="product[costprice][]" value="{{item.costprice}}" placeholder="成本价" class="layui-input layui-inline-1">
                </td>
                <td>
                    <input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="市场价" class="layui-input layui-inline-1">
                    <input type="text" name="product[mktprice][]" value="{{item.mktprice}}" placeholder="指导零售价" class="layui-input layui-inline-1">
                </td>
                <td>
                    <input type="text" name="product[levelOne][]" value="{{item.levelOne}}" placeholder="经销商返现" class="layui-input layui-inline-1">
@@ -566,7 +566,7 @@
                            </div>
                        </div>
                        <div class="layui-form-item">
                            <label class="layui-form-label">市场价</label>
                            <label class="layui-form-label">指导零售价</label>
                            <div class="layui-input-inline layui-inline-2">
                                <input class="layui-input" id="oneKeySetMktPrice">
                            </div>

 CoreCms.Net.Web.Admin/wwwroot/views/good/goods/index.html

@@ -230,7 +230,7 @@
                            //},
                            { field: 'price', title: '销售价', sort: false, width: 70, templet: function (data) { return '￥' + data.price } },
                            { field: 'costprice', title: '成本价', sort: false, width: 70, templet: function (data) { return '￥' + data.costprice } },
                            { field: 'mktprice', title: '市场价', sort: false, width: 70, templet: function (data) { return '￥' + data.mktprice } },
                            { field: 'mktprice', title: '指导零售价', sort: false, width: 70, templet: function (data) { return '￥' + data.mktprice } },
                            {
                                field: 'goodsCategoryId', title: '分类', sort: false, width: 80, templet: function (data) {
                                    for (var i = 0; i < d.data.categoriesAll.length; i++) {

 CoreCms.Net.Web.WebApi/Controllers/UserController.cs

@@ -1004,6 +1004,7 @@
                user.parentId,
                user.passWord,
                gradeName = userGrade != null ? userGrade.title : "",
                gradeKey= userGrade != null ? userGrade.valueKey:"",
                userCouponCount,
                orderCount,
                footPrintCount,