fixbug

admin-ui/.env.development

@@ -5,10 +5,10 @@ VUE_APP_TITLE = 一七管理系统
 ENV = 'development'
 
 
-#  VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
-# VUE_APP_BASE_API = 'http://127.0.0.1:9801'
-VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API_HOST = 'http://127.0.0.1:9801'
+VUE_APP_BASE_API = 'http://127.0.0.1:9801'
+#VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+#VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
 # VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
 

admin-ui/src/api/dataGroup.js

@@ -0,0 +1,7 @@
+import request from '@/utils/request'
+export function getGroupData(key) {
+  return request({
+    url: '/mapi/system/group/data/selectByKey?key='+key,
+    method: 'get'
+  })
+}

admin-ui/src/main.js

@@ -48,6 +48,7 @@ import VueMeta from 'vue-meta'
 import DictData from '@/components/DictData'
 
 import {getUserInfo} from "@/utils/auth";
+import {getGroupData} from "@/api/dataGroup";
 import {
   getUrlParam,
   isEmpty,
@@ -63,6 +64,7 @@ import {
 
 // 全局方法挂载
 Vue.prototype.getUserInfo = getUserInfo
+Vue.prototype.getGroupData = getGroupData
 Vue.prototype.getDicts = getDicts
 Vue.prototype.getConfigKey = getConfigKey
 Vue.prototype.parseTime = parseTime

admin-ui/src/views/order/cloth/orderList.vue

@@ -65,7 +65,7 @@
 
         <!-- 列表区域 -->
       <Page uri="/mapi/order/cloth/list" :request-params="queryParams" ref="pagination">
-        <el-table-column label="订单编号" align="center" width="180">
+        <el-table-column label="订单编号" align="center" width="110">
           <template slot-scope="scope">
             {{ scope.row.orderNo  }}
           </template>
@@ -75,45 +75,38 @@
             {{ scope.row.orderClothCount }}件
           </template>
         </el-table-column>
-        <el-table-column label="门店信息" align="center" width="140">
+        <el-table-column label="门店信息" align="center" width="120">
           <template slot-scope="scope">
-            <i class="el-icon-s-shop"></i>
             {{ scope.row.sysOrg.name }}
           </template>
         </el-table-column>
-        <el-table-column label="客户姓名" align="center" width="80">
+        <el-table-column label="客户姓名" align="center" width="120">
           <template slot-scope="scope">
-            <div class="customer-name">
-              <i class="el-icon-user"></i>
-              {{ scope.row.appUserName || '--' }}
-            </div>
+            {{ scope.row.appUserName || '--' }}
           </template>
         </el-table-column>
-        <el-table-column label="手机号" align="center" width="120">
+        <el-table-column label="手机号" align="center" width="100">
           <template slot-scope="scope">
-            <div class="customer-phone" v-if="scope.row.appUserPhoneNumber">
-              <i class="el-icon-mobile-phone"></i>
-              {{ scope.row.appUserPhoneNumber }}
-            </div>
+            {{ scope.row.appUserPhoneNumber }}
           </template>
         </el-table-column>
-        <el-table-column label="支付方式" align="center" width="100">
+        <el-table-column label="支付方式" align="center" width="90">
           <template slot-scope="scope">
             <el-tag type="warning" v-if="scope.row.payStatus == 0">未付款</el-tag>
             <dict-tag v-else :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
           </template>
         </el-table-column>
-        <el-table-column label="订单金额" align="center" width="100">
+        <el-table-column label="订单金额" align="center" width="80">
           <template slot-scope="scope">
             <span class="value">{{ scope.row.orderAmount ? '¥' + scope.row.orderAmount  : '--' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="支付金额" align="center" width="100">
+        <el-table-column label="支付金额" align="center" width="80">
           <template slot-scope="scope">
             <span class="value">{{ scope.row.payAmount ? '¥' + scope.row.payAmount  : '--' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="收款类型" align="center" width="100">
+        <el-table-column label="收款类型" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.payTimeType === '0' ? '收衣付款' : '取衣付款' }}
           </template>
@@ -139,15 +132,18 @@
             </div>
           </template>
         </el-table-column> -->
-        <el-table-column label="下单时间" align="center" width="180">
+        <el-table-column label="支付时间" align="center" width="150">
           <template slot-scope="scope">
-            <div class="time-info">
-              <i class="el-icon-time"></i>
-              {{ scope.row.createTime }}
-            </div>
+            <span v-if="scope.row.payStatus == 0">--</span>
+            <span v-else>{{ scope.row.payTime }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="下单时间" align="center" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.createTime }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="240" fixed="right">
+        <el-table-column label="操作" align="center" min-width="180" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" icon="el-icon-s-order" size="mini" @click="handleDetail(scope.row)"> 订单详情 </el-button>
             <el-button type="text" icon="el-icon-printer" size="mini" @click="btn_lodop(scope.row)" v-if="userInfoVO.userType != '00' && scope.row.orderAmount"> 打印订单 </el-button>

admin-ui/src/views/recharge/batchRecord/index.vue

@@ -22,6 +22,16 @@
                         @keyup.enter.native="handleQuery"
                     />
                 </el-form-item>
+              <el-form-item label="企业名称" prop="batchName">
+                <el-input
+                  v-model="queryParams.companyName"
+                  placeholder="请输入企业名称"
+                  clearable
+                  prefix-icon="el-icon-search"
+                  style="width: 240px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
                 <el-form-item label="过期时间" prop="lastExpireTime">
                     <el-date-picker
                         v-model="queryParams.lastExpireTime"
@@ -51,6 +61,7 @@
                 <el-table-column label="编号" align="center" prop="id" min-width="100" />
                 <el-table-column label="批次号" align="center" prop="batchNo" min-width="160" :show-overflow-tooltip="true" />
                 <el-table-column label="批次名称" align="center" prop="batchName" min-width="160" :show-overflow-tooltip="true" />
+                <el-table-column label="所属企业" align="center" prop="companyName" min-width="130" :show-overflow-tooltip="true" />
                 <el-table-column label="备注" align="center" prop="remark" min-width="200" :show-overflow-tooltip="true" />
                 <el-table-column label="激活过期时间" align="center" prop="lastExpireTime" width="160">
                     <template slot-scope="scope">

admin-ui/src/views/recharge/card/index.vue

@@ -10,6 +10,16 @@
           <el-input v-model="queryParams.batchNo" placeholder="请输入批次号" clearable prefix-icon="el-icon-tickets" style="width: 240px"
             @keyup.enter.native="handleQuery" />
         </el-form-item>
+        <el-form-item label="企业名称" prop="batchName">
+          <el-input
+            v-model="queryParams.companyName"
+            placeholder="请输入企业名称"
+            clearable
+            prefix-icon="el-icon-search"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item label="订单号" prop="orderNo">
           <el-input v-model="queryParams.orderNo" placeholder="请输入充值订单号" clearable prefix-icon="el-icon-document" style="width: 240px"
             @keyup.enter.native="handleQuery" />
@@ -67,6 +77,7 @@
             {{ scope.row.batchNo || '--' }}
           </template>
         </el-table-column>
+        <el-table-column label="所属企业" align="center" prop="companyName" min-width="130" :show-overflow-tooltip="true" />
         <el-table-column label="归属门店" align="center" prop="rechargeStoreName" min-width="150" :show-overflow-tooltip="true" />
         <el-table-column label="充值金额" align="center" min-width="120">
           <template slot-scope="scope">

admin-ui/src/views/recharge/cardVersion/index.vue

@@ -100,11 +100,11 @@
         </el-card>
 
         <!-- 添加或修改充值卡版本对话框 -->
-        <el-dialog 
-            :title="title" 
-            :visible.sync="open" 
-            width="700px" 
-            append-to-body 
+        <el-dialog
+            :title="title"
+            :visible.sync="open"
+            width="700px"
+            append-to-body
             destroy-on-close
             :close-on-click-modal="false"
         >
@@ -189,11 +189,11 @@
         </el-dialog>
 
         <!-- 一键生成充值卡对话框 -->
-        <el-dialog 
-            title="一键生成充值卡" 
-            :visible.sync="multiInsertOpen" 
-            width="700px" 
-            append-to-body 
+        <el-dialog
+            title="一键生成充值卡"
+            :visible.sync="multiInsertOpen"
+            width="800px"
+            append-to-body
             destroy-on-close
             :close-on-click-modal="false"
             v-loading="multiInsertLoading"
@@ -225,6 +225,14 @@
                                 />
                             </el-form-item>
                         </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="所属企业" prop="companyName" >
+                          <el-select v-model="multiInsertForm.companyName" placeholder="请选择企业" clearable >
+                            <el-option v-for="company in companyData" :key="company.id" :label="company.name" :value="company.name" />
+                          </el-select>
+
+                        </el-form-item>
+                      </el-col>
                         <el-col :span="12">
                             <el-form-item label="生成数量" prop="createNum" required>
                                 <el-input-number
@@ -312,6 +320,7 @@ export default {
             total: 0,
             // 充值卡版本表格数据
             cardVersionList: [],
+            companyData: [], //公司数据
             // 弹出层标题
             title: '',
             // 是否显示弹出层
@@ -332,6 +341,7 @@ export default {
                 isSupportGoods: 'Y',
                 isSupportLife: 'Y',
                 isSupportCar: 'Y',
+                companyName: '',
                 versionId: 0,
                 createNum: 0
             },
@@ -347,7 +357,8 @@ export default {
         }
     },
     created() {
-        this.getList()
+        this.getList();
+        this.getCompanyData();
     },
     methods: {
         /** 查询充值卡版本列表 */
@@ -356,6 +367,11 @@ export default {
                 this.$refs.pagination.handleSearch(true)
             })
         },
+      getCompanyData(){
+        this.getGroupData("company_info").then((res) => {
+          this.companyData = res.data
+        })
+      },
         // 取消按钮
         cancel() {
             this.open = false
@@ -538,11 +554,11 @@ export default {
     .give-info {
         .el-tag {
             margin: 0 4px;
-            
+
             &:first-child {
                 margin-left: 0;
             }
-            
+
             &:last-child {
                 margin-right: 0;
             }

admin-ui/src/views/systemSet/sellGoods/index.vue

@@ -248,6 +248,7 @@
 import { addPurchaseGoods, confirmOrder, getPurchaseGoods, refuseOrder, sellGoodsList, outOrderGoods, outOrderGoodsBySelf, getDeliveryPath, confirmReceiveGoodsByOrderGoods } from '@/api/order/purchaseGoods'
 import { getdeliveryAll } from '@/api/order/goods'
 import { allOrg } from '@/api/system/store'
+import { getGroupData } from '@/utils/auth'
 export default {
     name: 'goodsPurchase',
     dicts: ['purchase_order_status', 'recharge_pay_type'],
@@ -510,7 +511,7 @@ export default {
         },
         //获取快递公司
         getdeliveryAll() {
-            getdeliveryAll().then((res) => {
+            this.getGroupData("express_company").then((res) => {
                 this.deliveryData = res.data
             })
         },

yiqi-admin/src/main/java/com/yiqi/admin/controller/order/OrderClothItemController.java

@@ -767,7 +767,6 @@ public class OrderClothItemController extends BaseController {
                     .collect(Collectors.toMap(ClothHanger::getId, ClothHanger -> ClothHanger));
         }
         Map<Long, SysOrg> storeOrgMap = new HashMap<>();
-        Map<Long, SysOrg> factoryOrgMap = new HashMap<>();
         if (orderClothItemVOList.stream().filter(orderCloth -> SourceType.STORE.getCode()
                 .equals(orderCloth.getSourceType())).collect(Collectors.toList()).size() > 0) {
             storeOrgMap = sysOrgService.list(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getSourceType

yiqi-admin/src/main/java/com/yiqi/admin/controller/recharge/RechargeCardBatchRecordController.java

@@ -64,6 +64,9 @@ public class RechargeCardBatchRecordController extends BaseController {
         if (StringUtils.isNotEmpty(rechargeCardBatchRecordQueryDTO.getBatchName())) {
             queryWrapper.like(RechargeCardBatchRecord::getBatchName, rechargeCardBatchRecordQueryDTO.getBatchName());
         }
+        if (StringUtils.isNotEmpty(rechargeCardBatchRecordQueryDTO.getCompanyName())) {
+            queryWrapper.like(RechargeCardBatchRecord::getCompanyName, rechargeCardBatchRecordQueryDTO.getCompanyName());
+        }
         if (rechargeCardBatchRecordQueryDTO.getBeginLastExpireTime() != null) {
             queryWrapper.ge(RechargeCardBatchRecord::getLastExpireTime, rechargeCardBatchRecordQueryDTO.getBeginLastExpireTime());
         }

yiqi-admin/src/main/java/com/yiqi/admin/controller/recharge/RechargePasswordCardController.java

@@ -240,7 +240,7 @@ public class RechargePasswordCardController extends BaseController {
 
     @Log(title = "充值卡管理", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('recharge:card:import')")
-    @PostMapping(value = "multiInsert")
+    @PostMapping(value = "/multiInsert")
     @ApiOperation("批量生成充值卡")
     public AjaxResult multiInsert(@RequestBody @Valid RechargeCardMultiInsertDTO rechargeCardMultiInsertDTO) throws Exception {
         RechargeCardVersion rechargeCardVersion = rechargeCardVersionService.selectRechargeCardVersionById(rechargeCardMultiInsertDTO.getVersionId());
@@ -256,6 +256,7 @@ public class RechargePasswordCardController extends BaseController {
         rechargeCardBatchRecord.setLastUseLevel(rechargeCardMultiInsertDTO.getLevel());
         rechargeCardBatchRecord.setStarLevel(rechargeCardMultiInsertDTO.getStarLevel());
         rechargeCardBatchRecord.setRemark(rechargeCardMultiInsertDTO.getRemark());
+        rechargeCardBatchRecord.setCompanyName(rechargeCardMultiInsertDTO.getCompanyName());
         rechargeCardBatchRecordService.save(rechargeCardBatchRecord);
 
 
@@ -281,6 +282,7 @@ public class RechargePasswordCardController extends BaseController {
             rechargePasswordCard.setCreateById(getUserId());
             rechargePasswordCard.setCreateBy(getUsername());
             rechargePasswordCard.setCreateTime(DateUtils.getNowDate());
+            rechargePasswordCard.setCompanyName(rechargeCardMultiInsertDTO.getCompanyName());
             rechargePasswordCard.setIsSupportCar(rechargeCardMultiInsertDTO.getIsSupportCar());
             rechargePasswordCard.setIsSupportGoods(rechargeCardMultiInsertDTO.getIsSupportGoods());
             rechargePasswordCard.setIsSupportCloth(rechargeCardMultiInsertDTO.getIsSupportCloth());

yiqi-common/src/main/java/com/yiqi/order/domain/vo/OrderClothItemVO.java

@@ -218,6 +218,11 @@ public class OrderClothItemVO extends BaseEntity {
     @ApiModelProperty("洗衣状态")
     private String flowStatus;
 
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("支付时间")
+    private Date payTime;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("预计取衣时间")
     private Date planSendClothTime;

yiqi-common/src/main/java/com/yiqi/order/domain/vo/OrderClothQueryVO.java

@@ -75,6 +75,11 @@ public class OrderClothQueryVO {
     @ApiModelProperty("下单渠道（APP=APP，WXAPP=小程序，OFFLINE=线下门店）")
     private String orderSource;
 
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("支付时间")
+    private Date payTime;
+
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("创建时间")

yiqi-common/src/main/java/com/yiqi/recharge/domain/RechargeCardBatchRecord.java

@@ -61,4 +61,8 @@ public class RechargeCardBatchRecord extends BaseEntity
     @ApiModelProperty("是否直充（Y是，N否）")
     private String isDirectRecharge;
 
+    /** 团单公司 */
+    @Excel(name = "团单公司")
+    @ApiModelProperty("团单公司")
+    private String companyName;
 }

yiqi-common/src/main/java/com/yiqi/recharge/domain/RechargePasswordCard.java

@@ -212,4 +212,9 @@ public class RechargePasswordCard extends BaseEntity {
     @ApiModelProperty("充值卡总余额")
     @TableField(exist = false)
     private BigDecimal totalBalance;
+
+    /** 团单公司 */
+    @Excel(name = "团单公司")
+    @ApiModelProperty("团单公司")
+    private String companyName;
 }

yiqi-common/src/main/java/com/yiqi/recharge/domain/dto/RechargeCardBatchRecordQueryDTO.java

@@ -21,6 +21,10 @@ public class RechargeCardBatchRecordQueryDTO extends PageVO {
     @ApiModelProperty("批次名称")
     private String batchName;
 
+    /** 企业名称 */
+    @ApiModelProperty("企业名称")
+    private String companyName;
+
     /** 最近一次设置的到期时间 */
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("最近一次设置的到期时间")

yiqi-common/src/main/java/com/yiqi/recharge/domain/dto/RechargeCardMultiInsertDTO.java

@@ -19,6 +19,9 @@ public class RechargeCardMultiInsertDTO {
     @ApiModelProperty("创建数量")
     private Integer createNum;
 
+    @ApiModelProperty("公司")
+    private String companyName;
+
     @NotBlank(message = "批次名称不能为空")
     @ApiModelProperty("批次名称")
     private String batchName;

yiqi-core/src/main/resources/mapper/order/OrderClothItemMapper.xml

@@ -601,7 +601,7 @@
 
     <select id="queryClothItem" resultType="com.yiqi.order.domain.vo.OrderClothItemVO"
             parameterType="com.yiqi.order.domain.dto.OrderClothItemQueryDTO">
-        select item.*, cl.order_status, cl.pay_status, cl.contact_name, cl.contact_phone  from order_cloth_item item left join order_cloth cl on item.order_id = cl.id
+        select item.*, cl.order_status, cl.pay_status, cl.contact_name, cl.contact_phone, cl.pay_time  from order_cloth_item item left join order_cloth cl on item.order_id = cl.id
         where 1 = 1
         <if test="orderNo != null and orderNo != ''">
             and cl.order_no = #{orderNo}