Browse Source

add 修复bug,调整商品菜单,采购优化

xuhaifeng 2 months ago
parent
commit
07575251b2

+ 2 - 2
admin-ui/src/views/activity/couponItem/index.vue

@@ -58,7 +58,7 @@
         </el-card>
 
         <!-- 添加或修改注册送券活动优惠券明细对话框 -->
-        <el-dialog :title="title" :visible.sync="open" width="650px" :close-on-click-modal="false" :before-close="handleClose">
+        <el-dialog :title="title" :visible.sync="open" width="650px" :close-on-click-modal="false" :before-close="handleClose" append-to-body>
             <el-form ref="form" :model="form" :rules="rules" label-width="120px">
                 <el-card class="box-card" shadow="never">
                     <div slot="header">
@@ -106,7 +106,7 @@
         </el-dialog>
 
         <!-- 库存调整对话框 -->
-        <el-dialog :title="stockTitle" :visible.sync="stockOpen" width="500px" :close-on-click-modal="false" :before-close="handleStockClose">
+        <el-dialog :title="stockTitle" :visible.sync="stockOpen" width="500px" :close-on-click-modal="false" :before-close="handleStockClose" append-to-body>
             <el-form ref="stockForm" :model="stockForm" :rules="stockRoles" label-width="120px">
                 <el-form-item :label="stockTitle + '数量'" prop="stockNum">
                     <el-input-number v-model="stockForm.stockNum" placeholder="请输入库存数量" :min="0" style="width: 200px" />

+ 16 - 16
admin-ui/src/views/index.vue

@@ -198,7 +198,7 @@ export default {
       revenueTimeRange: 'today',
       rankingTimeRange: 'week',
       amountTrendData: [],
-      countTrendData: {},
+      countTrendData: [],
       storeRankings: []
     }
   },
@@ -249,7 +249,7 @@ export default {
         endDate: this.formatDate(new Date())
       }
       getTotalStatistics(params).then(response => {
-        this.factoryStatistics = response.data || {}
+        this.factoryStatistics = response.data
       })
     },
     getStartDateByTimeRange() {
@@ -334,7 +334,7 @@ export default {
 .home {
   .panel-group {
     margin-top: 18px;
-    
+
     .stat-card {
       height: 120px;
       border-radius: 8px;
@@ -345,40 +345,40 @@ export default {
       justify-content: center;
       box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
       transition: all 0.3s;
-      
+
       &:hover {
         transform: translateY(-5px);
         box-shadow: 0 8px 16px rgba(0, 0, 0, 0.15);
       }
-      
+
       .stat-card-title {
         font-size: 16px;
         margin-bottom: 10px;
         opacity: 0.9;
       }
-      
+
       .stat-card-value {
         font-size: 28px;
         font-weight: bold;
       }
     }
-    
+
     .stat-card-blue {
       background: linear-gradient(135deg, #1890ff, #36cfc9);
     }
-    
+
     .stat-card-green {
       background: linear-gradient(135deg, #52c41a, #73d13d);
     }
-    
+
     .stat-card-red {
       background: linear-gradient(135deg, #f5222d, #ff4d4f);
     }
-    
+
     .stat-card-orange {
       background: linear-gradient(135deg, #fa8c16, #ffa940);
     }
-    
+
     .card-panel {
       height: 108px;
       cursor: pointer;
@@ -434,30 +434,30 @@ export default {
       }
     }
   }
-  
+
   .chart-wrapper {
     background: #fff;
     padding: 20px;
     border-radius: 4px;
     box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
-    
+
     .chart-header {
       display: flex;
       justify-content: space-between;
       align-items: center;
       margin-bottom: 20px;
-      
+
       .chart-title {
         font-size: 16px;
         font-weight: bold;
         color: #303133;
       }
     }
-    
+
     .chart-content {
       height: 300px;
     }
-    
+
     .chart-content-1 {
       height: 130px;
     }

+ 13 - 13
admin-ui/src/views/order/cloth/collectCloth.vue

@@ -6,7 +6,7 @@
                 <div slot="header" class="clearfix">
                     <span>选择客户</span>
                 </div>
-                
+
                 <!-- 搜索区域 -->
                 <el-form :model="queryParams"  @submit.native.prevent  ref="queryForm">
                     <div class="search-box">
@@ -22,10 +22,10 @@
                 </el-form>
 
                 <!-- 用户信息展示 -->
-                <el-descriptions 
-                    v-if="appUserInfo" 
+                <el-descriptions
+                    v-if="appUserInfo"
                     class="user-info"
-                    :column="1" 
+                    :column="1"
                     border>
                     <el-descriptions-item label="用户名">
                         {{ appUserInfo.realName }}
@@ -71,7 +71,7 @@
 
                 <!-- 衣物列表 -->
                 <div class="cloth-list">
-                    <el-table 
+                    <el-table
                         :data="orderClothItemDTOS"
                         border
                         stripe
@@ -114,8 +114,8 @@
                         </el-table-column>
                         <el-table-column label="特殊处理" width="120">
                             <template slot-scope="scope">
-                                <el-button 
-                                    type="text" 
+                                <el-button
+                                    type="text"
                                     class="price-text"
                                     @click="changeClothSpecialPriceEvent(scope.$index)">
                                     ¥{{ calculateClothSpecialPrice(scope.$index) }}
@@ -125,8 +125,8 @@
                         <el-table-column label="单价" width="100">
                             <template slot-scope="scope">
                                 <template v-if="scope.row.isChangePrice == 'Y'">
-                                    <el-button 
-                                        type="text" 
+                                    <el-button
+                                        type="text"
                                         class="price-text"
                                         @click="changeClothDefaultPriceEvent(scope.$index)">
                                         ¥{{ scope.row.defaultPrice }}
@@ -187,7 +187,7 @@
                                     </el-select>
                                 </el-form-item>
 
-                                <el-form-item 
+                                <el-form-item
                                     v-if="orderForm.isAppointment == 'Y'"
                                     label="取衣方式">
                                     <el-select v-model="orderForm.sendClothWay" placeholder="请选择" clearable>
@@ -207,7 +207,7 @@
                     </div>
 
                     <div class="action-area">
-                        <el-button 
+                        <el-button
                             type="danger"
                             class="checkout-btn"
                             icon="el-icon-shopping-cart-2"
@@ -481,7 +481,7 @@
             </span>
         </el-dialog>
 
-        <el-dialog title="收银" :visible.sync="confirmPayOpen" size="80%" :before-close="handleClose" destroy-on-close append-to-body>
+        <el-dialog title="收银" :visible.sync="confirmPayOpen" size="90%" :before-close="handleClose" destroy-on-close append-to-body>
             <CashCloth ref="cashCloth" :orderForm="orderForm" :orderClothItemDTOS="orderClothItemDTOS" :appUserInfo="appUserInfo" :clothSpeeds="clothSpeeds" :deductCouponVOS="deductCouponVOS" :discountCouponVOS="discountCouponVOS" @onPaySuccess="onPaySuccess" @initOrderList="initOrderList" @confirm="handelPaySuccess"/>
         </el-dialog>
 
@@ -1927,4 +1927,4 @@ export default {
         }
     }
 }
-</style>
+</style>

+ 20 - 20
admin-ui/src/views/order/cloth/component/cashCloth.vue

@@ -61,10 +61,10 @@
                             </div>
 
                             <div class="payment-methods">
-                                <el-radio-group v-model="orderForm.payType" size="large" @change="changePayType">
-                                    <el-radio-button label="3"> <i class="el-icon-wallet"></i> 余额 </el-radio-button>
-                                    <el-radio-button label="2"> <i class="el-icon-money"></i> 现金 </el-radio-button>
-                                    <el-radio-button label="0"> <i class="el-icon-mobile-phone"></i> 扫码 </el-radio-button>
+                                <el-radio-group v-model="orderForm.payType" size="large" @change="changePayType" >
+                                    <el-radio-button label="3" style="width: 80px"> <i class="el-icon-wallet"></i> 余额 </el-radio-button>
+                                    <el-radio-button label="2" style="width: 80px"> <i class="el-icon-money"></i> 现金 </el-radio-button>
+                                    <el-radio-button label="0" style="width: 80px"> <i class="el-icon-mobile-phone"></i> 扫码 </el-radio-button>
                                 </el-radio-group>
                             </div>
 
@@ -82,7 +82,7 @@
                     </div>
 
                     <!-- 右侧优惠信息区域 -->
-                    <div class="discount-section" v-if="orderForm.isAppointment === 'N'">
+                    <div class="discount-section" style="width: 600px">
                         <el-card class="discount-card">
                             <el-tabs v-model="confirmCouponTabIndex" type="border-card">
                                 <!-- 优惠券 tab -->
@@ -93,7 +93,7 @@
                                     <!-- 已选优惠券列表 -->
                                     <div class="selected-coupons">
                                         <el-table :data="selectCoupons" size="small" border height="calc(100vh - 400px)" style="width: 100%">
-                                            <el-table-column label="优惠券" align="center" prop="couponTypeTitle" width="120" />
+                                            <el-table-column label="优惠券" align="center" prop="couponTypeTitle" width="80" />
                                             <el-table-column label="类型" align="center" width="80">
                                                 <template slot-scope="scope">
                                                     <el-tag size="mini" :type="getTagType(scope.row.discountWay)">
@@ -101,7 +101,7 @@
                                                     </el-tag>
                                                 </template>
                                             </el-table-column>
-                                            <el-table-column label="优惠内容" align="center" width="150">
+                                            <el-table-column label="优惠内容" align="center" width="120">
                                                 <template slot-scope="scope">
                                                     <div class="discount-content">
                                                         <template v-if="scope.row.discountWay == '0'">
@@ -135,7 +135,7 @@
                                                     </el-popover>
                                                 </template>
                                             </el-table-column>
-                                            <el-table-column label="操作" align="center" width="120" fixed="right">
+                                            <el-table-column label="操作" align="center" width="100" fixed="right">
                                                 <template slot-scope="scope">
                                                     <el-button type="text" @click="changeCouponDiscountCloth(scope.$index)" v-if="canModifyCoupon(scope.row, scope.$index)"> 修改 </el-button>
                                                     <el-button type="text" style="color: #ff4949" @click="removeSelectCoupon(scope.$index)" v-if="scope.$index == selectCoupons.length - 1"> 删除 </el-button>
@@ -171,15 +171,15 @@
                             <span v-if="scope.row.discountWay == '2'">优惠{{ getDiscountStr(scope.row.discountRate) }},最多折扣{{ scope.row.deductAmount }}元</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="是否单件" align="center" prop="isUnique">
-                        <template slot-scope="scope">
-                            <span v-if="scope.row.discountWay == '2'">
-                                <span v-if="scope.row.isUnique == 'Y'">单件</span>
-                                <span v-if="scope.row.isUnique == 'N'">非单件</span>
-                            </span>
-                            <span v-else>--</span>
-                        </template>
-                    </el-table-column>
+<!--                    <el-table-column label="是否单件" align="center" prop="isUnique">-->
+<!--                        <template slot-scope="scope">-->
+<!--                            <span v-if="scope.row.discountWay == '2'">-->
+<!--                                <span v-if="scope.row.isUnique == 'Y'">单件</span>-->
+<!--                                <span v-if="scope.row.isUnique == 'N'">非单件</span>-->
+<!--                            </span>-->
+<!--                            <span v-else>&#45;&#45;</span>-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
                     <el-table-column label="适用衣服" align="center">
                         <template slot-scope="scope">
                             <template v-for="(item, index) in scope.row.appCouponTypeApplyClothVOS" v-key="index">
@@ -940,10 +940,10 @@ export default {
         display: flex;
         gap: 20px;
         height: 100%;
-        padding: 20px;
+        padding: 5px;
 
         .info-section {
-            width: 320px; /* 减小左侧宽度 */
+            width: 300px; /* 减小左侧宽度 */
             display: flex;
             flex-direction: column;
             gap: 20px;
@@ -1002,7 +1002,7 @@ export default {
         }
 
         .payment-methods {
-            margin: 20px 0;
+            margin: 10px 0;
             text-align: center;
         }
 

+ 6 - 0
admin-ui/src/views/settlement/rate/factoryRate.vue

@@ -47,6 +47,12 @@
           {{ scope.row.endDate || '--' }}
         </template>
       </el-table-column>
+      <el-table-column label="是否有效" align="center" prop="startDate">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isValid === 1" size="mini" type="success">有效</el-tag>
+          <el-tag v-else size="mini" type="danger">无效</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">
         <template slot-scope="scope">
           <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['settlement:factory:rate:edit']">修改</el-button>

+ 5 - 4
admin-ui/src/views/settlement/rate/storeRate.vue

@@ -82,14 +82,15 @@
           <span v-else>--</span>
         </template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="startDate">
+      <el-table-column label="生效时间" align="center" prop="startDate">
         <template slot-scope="scope">
-          {{ scope.row.startDate || '--' }}
+          {{ scope.row.startDate || '-' }} - {{ scope.row.endDate || '-' }}
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endDate">
+      <el-table-column label="是否有效" align="center" prop="startDate">
         <template slot-scope="scope">
-          {{ scope.row.endDate || '--' }}
+          <el-tag v-if="scope.row.isValid === 1" size="mini" type="success">有效</el-tag>
+          <el-tag v-else size="mini" type="danger">无效</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="150">

+ 8 - 1
admin-ui/src/views/systemSet/sellGoods/retailStore.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="app-container">
+    <el-tabs v-model="goodsType" @tab-click="onChangeGoodsType">
+      <el-tab-pane v-for="dict in dict.type.goods_type" :label="dict.label" :name="dict.value"></el-tab-pane>
+    </el-tabs>
     <el-form :model="queryParams" ref="queryForm" @submit.native.prevent :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item prop="orderNo">
         <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
@@ -252,7 +255,7 @@ import { allOrg } from '@/api/system/store'
 import { getdeliveryAll, getDeliveryPath } from '@/api/order/goods'
 export default {
   name: 'retailStore',
-  dicts: ['purchase_order_status', 'recharge_pay_type'],
+  dicts: ['purchase_order_status', 'recharge_pay_type', 'goods_type'],
   data() {
     var validateNumberInput = (rule, value, callback) => {
       if (!value || isNaN(value)) {
@@ -406,6 +409,10 @@ export default {
     handleUser() {
       this.userInfoVO = this.getUserInfo()
     },
+    onChangeGoodsType() {
+      this.queryParams.goodsType = this.goodsType
+      this.handleQuery()
+    },
     confirmOrder(row) {
       this.$confirm('是否确认接单?')
         .then(() => {

+ 141 - 0
yiqi-admin/src/main/java/com/yiqi/admin/controller/settlement/PlatformStatisticsController.java

@@ -0,0 +1,141 @@
+package com.yiqi.admin.controller.settlement;
+
+import com.yiqi.common.constant.UrlConstants;
+import com.yiqi.common.core.controller.BaseController;
+import com.yiqi.common.core.domain.AjaxResult;
+import com.yiqi.common.core.page.TableDataInfo;
+import com.yiqi.common.utils.DateUtils;
+import com.yiqi.common.utils.poi.ExcelUtil;
+import com.yiqi.core.service.ISettlementFactoryStatisticsService;
+import com.yiqi.core.service.ISettlementStoreClothStatisticsService;
+import com.yiqi.order.domain.dto.SettlementFactoryStatisticsDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 平台统计报表
+ */
+@RestController
+@RequestMapping(UrlConstants.managerApi + "/platform/statistics")
+public class PlatformStatisticsController extends BaseController {
+
+    @Autowired
+    private ISettlementFactoryStatisticsService settlementFactoryStatisticsService;
+
+    @Autowired
+    private ISettlementStoreClothStatisticsService settlementStoreClothStatisticsService;
+
+    /**
+     * 获取工厂端首页总收益数据
+     */
+    @GetMapping("/dashborad")
+    public AjaxResult dashboard() {
+        SettlementFactoryStatisticsDto settlementFactoryStatisticsDto = settlementStoreClothStatisticsService.totalByCondition(getFactoryId(), null, null, null);
+        return AjaxResult.success(settlementFactoryStatisticsDto);
+    }
+
+    /**
+     * 获取门店每日交易统计列表
+     */
+    @GetMapping("/list/bydate")
+    public TableDataInfo generateFactoryStatisticsByDate(@RequestParam(required = false) String startDate,
+                                                         @RequestParam(required = false) String endDate,
+                                                         @RequestParam(required = false) Long storeId,
+                                                         @RequestParam(defaultValue = "1") Integer pageNum,
+                                                         @RequestParam(defaultValue = "10") Integer pageSize) {
+
+        Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
+        Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
+        List<SettlementFactoryStatisticsDto> statisticsList = settlementFactoryStatisticsService
+                .generateFactoryStatisticsByDate(getLoginUser().getOrgId(), storeId, start, end, pageNum, pageSize);
+        Long totalCount = (long) statisticsList.size();
+        // 4. 处理分页
+        if (pageNum != null && pageSize != null && pageNum > 0 && pageSize > 0) {
+            int startIndex = (pageNum - 1) * pageSize;
+            int endIndex = Math.min(startIndex + pageSize, statisticsList.size());
+            if (startIndex >= statisticsList.size()) {
+                statisticsList = Collections.emptyList();
+            }
+            statisticsList = statisticsList.subList(startIndex, endIndex);
+        }
+        return getDataTable(statisticsList, totalCount);
+    }
+
+
+    /**
+     * 获取门店每日充值统计列表
+     */
+    @GetMapping("/list/bystore")
+    public TableDataInfo generateFactoryStatisticsByStore(@RequestParam(required = false) String startDate,
+                                                          @RequestParam(required = false) String endDate,
+                                                          @RequestParam(required = false) Long storeId,
+                                                          @RequestParam(defaultValue = "1") Integer pageNum,
+                                                          @RequestParam(defaultValue = "15") Integer pageSize) {
+        Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
+        Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
+        List<SettlementFactoryStatisticsDto> statisticsList = settlementFactoryStatisticsService
+                .generateFactoryStatisticsByStoreId(getLoginUser().getOrgId(), storeId, start, end);
+        Long totalCount = (long) statisticsList.size();
+        // 4. 处理分页
+        if (pageNum != null && pageSize != null && pageNum > 0 && pageSize > 0) {
+            int startIndex = (pageNum - 1) * pageSize;
+            int endIndex = Math.min(startIndex + pageSize, statisticsList.size());
+            if (startIndex >= statisticsList.size()) {
+                statisticsList = Collections.emptyList();
+            }
+            statisticsList = statisticsList.subList(startIndex, endIndex);
+        }
+        return getDataTable(statisticsList, totalCount);
+    }
+
+    /**
+     * 获取门店每日充值统计列表
+     */
+    @GetMapping("/total")
+    public AjaxResult generateFactoryStatistics(@RequestParam(required = false) String startDate,
+                                                @RequestParam(required = false) String endDate,
+                                                @RequestParam(required = false) Long storeId,
+                                                @RequestParam(defaultValue = "1") Integer pageNum,
+                                                @RequestParam(defaultValue = "15") Integer pageSize) {
+        Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
+        Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
+        SettlementFactoryStatisticsDto settlementFactoryStatisticsDto = settlementFactoryStatisticsService
+                .generateTotalFactoryStatistics(getLoginUser().getOrgId(), storeId, start, end);
+        return AjaxResult.success(settlementFactoryStatisticsDto);
+    }
+
+    /**
+     *
+     */
+    @PostMapping("/export/bystore")
+    public void chargeExport(HttpServletResponse response, @RequestParam(required = false) String startDate,
+                             @RequestParam(required = false) String endDate,
+                             @RequestParam(required = false) Long storeId) {
+        Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
+        Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
+        List<SettlementFactoryStatisticsDto> list = settlementFactoryStatisticsService
+                .generateFactoryStatisticsByStoreId(getLoginUser().getOrgId(), storeId, start, end);
+        ExcelUtil<SettlementFactoryStatisticsDto> util = new ExcelUtil<>(SettlementFactoryStatisticsDto.class);
+        util.exportExcel(response, list, "工厂门店报表统计");
+    }
+
+    /**
+     * 导出门店每日交易统计
+     */
+    @PostMapping("/export/bydate")
+    public void export(HttpServletResponse response, @RequestParam(required = false) String startDate,
+                       @RequestParam(required = false) String endDate,
+                       @RequestParam(required = false) Long storeId) {
+        Date start = startDate != null ? DateUtils.parseDate(startDate) : DateUtils.addDays(new Date(), -14);
+        Date end = endDate != null ? DateUtils.parseDate(endDate) : new Date();
+        List<SettlementFactoryStatisticsDto> list = settlementFactoryStatisticsService
+                .generateFactoryStatisticsByDate(getLoginUser().getOrgId(), storeId, start, end, 1, 1000);
+        ExcelUtil<SettlementFactoryStatisticsDto> util = new ExcelUtil<>(SettlementFactoryStatisticsDto.class);
+        util.exportExcel(response, list, "工厂每日报表统计");
+    }
+}

+ 3 - 5
yiqi-admin/src/main/java/com/yiqi/task/SettlementStoreClothTask.java

@@ -3,8 +3,6 @@ package com.yiqi.task;
 import cn.hutool.core.date.DateUtil;
 import com.yiqi.common.utils.DateUtils;
 import com.yiqi.core.service.ISettlementFactoryStatisticsService;
-import com.yiqi.core.service.ISettlementStoreClothStatisticsService;
-import com.yiqi.core.service.ISettlementStoreStatisticsService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,7 +11,7 @@ import org.springframework.stereotype.Component;
 import java.util.Date;
 
 /**
- * 门店订单衣服每日结算
+ * 工厂订单衣服每日结算
  *
  * @author ruoyi
  */
@@ -29,8 +27,8 @@ public class SettlementStoreClothTask {
         if (StringUtils.isNotBlank(dateStr)) {
             date = DateUtils.parseDate(dateStr);
         }
-        log.info("*****开始执行门店衣服"+ DateUtil.formatDate(date) +"日结算任务*****");
+        log.info("*****开始执行工厂衣服"+ DateUtil.formatDate(date) +"日结算任务*****");
         settlementFactoryStatisticsService.generateDayStatistics(date);
-        log.info("*****结束执行门店衣服"+ DateUtil.formatDate(date) +"日结算任务*****");
+        log.info("*****结束执行工厂衣服"+ DateUtil.formatDate(date) +"日结算任务*****");
     }
 }

+ 3 - 3
yiqi-admin/src/main/java/com/yiqi/task/SettlementStoreOrderTask.java

@@ -15,7 +15,7 @@ import java.util.Calendar;
 import java.util.Date;
 
 /**
- * 门店订单每日结算
+ * 门店衣服每日结算
  *
  * @author ruoyi
  */
@@ -33,8 +33,8 @@ public class SettlementStoreOrderTask {
             date = DateUtils.parseDate(dateStr);
         }
         //昨天结算
-        log.info("*****开始执行门店订单"+ DateUtil.formatDate(date) +"日结算任务*****");
+        log.info("*****开始执行门店衣服订单"+ DateUtil.formatDate(date) +"日结算任务*****");
         settlementStoreStatisticsService.generateDayStatistics(date);
-        log.info("*****结束执行门店订单"+ DateUtil.formatDate(date) +"日结算任务*****");
+        log.info("*****结束执行门店衣服订单"+ DateUtil.formatDate(date) +"日结算任务*****");
     }
 }

+ 0 - 3
yiqi-core/src/main/java/com/yiqi/core/service/impl/SettlementStoreStatisticsServiceImpl.java

@@ -144,9 +144,6 @@ public class SettlementStoreStatisticsServiceImpl extends ServiceImpl<Settlement
         storeStatistics.setStoreId(storeId);
         storeStatistics.setDay(Integer.valueOf(DateUtil.format(date, "yyyyMMdd")));
         storeStatistics.setCreateTime(DateUtils.getNowDate());
-        storeStatistics.setCreateBy(SecurityUtils.getUsername());
-        storeStatistics.setUpdateTime(DateUtils.getNowDate());
-        storeStatistics.setUpdateBy(SecurityUtils.getUsername());
 
         // 2.3 设置洗衣订单统计
         OrderStatisticsVO clothStats = statistics.getClothOrderStats();

+ 1 - 1
yiqi-core/src/main/resources/mapper/settlement/SettlementFactoryRateMapper.xml

@@ -6,7 +6,7 @@
 
 
     <select id="queryList" resultType="com.yiqi.settlement.domain.vo.SettlementFactoryRateListVO">
-        select f.id as factoryId, f.factory_name as 'factoryName', ssr.material_rate,
+        select f.id as factoryId, f.factory_name as 'factoryName', ssr.id, ssr.material_rate,
         ssr.management_rate,
         ssr.deposit_rate,
         ssr.start_date,

+ 1 - 1
yiqi-core/src/main/resources/mapper/settlement/SettlementStoreRateMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.yiqi.settlement.mapper.SettlementStoreRateMapper">
 
     <select id="queryList" resultType="com.yiqi.settlement.domain.vo.SettlementStoreRateListVO">
-        select s.id as 'storeId', s.name as 'storeName', ssr.factory_rate,
+        select s.id as 'storeId', s.name as 'storeName', ssr.id, ssr.factory_rate,
         ssr.material_rate,
         ssr.card_deposit_rate,
         ssr.welfare_deposit_rate,