fixbug

.gitignore

@@ -32,3 +32,4 @@ build/
 
 ### VS Code ###
 .vscode/
+/D:/ruoyi/uploadPath/avatar/2025/05/11/blob_20250511095432A001.png

admin-ui/src/views/activity/couponInfo/index.vue

@@ -70,10 +70,17 @@
                         <div class="tag-group">
                             <el-tag size="mini" effect="plain"  type="primary">{{ getUserScopeLabel(scope.row.userScope) }}</el-tag>
                             <el-tag size="mini" effect="plain" type="success">{{ getStoreScopeLabel(scope.row.storeScope) }}</el-tag>
-                            <el-tag size="mini" effect="plain" type="warning">限购 {{ scope.row.maxBuyNum }} 张</el-tag>
                         </div>
                 </template>
             </el-table-column>
+          <el-table-column label="限购" align="center" min-width="150">
+            <template slot-scope="scope">
+              <div class="tag-group">
+                <el-tag size="mini" effect="plain" type="warning" v-if="scope.row.maxBuyNum==9999"> 不限 </el-tag>
+                <el-tag size="mini" effect="plain" type="warning" v-else> {{ scope.row.maxBuyNum }} 张</el-tag>
+              </div>
+            </template>
+          </el-table-column>
                 <el-table-column label="活动状态" align="center" width="100">
                 <template slot-scope="scope">
                         <div class="status-column">

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

@@ -128,7 +128,7 @@
             <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)">详情</el-button>
-                    <el-button type="text" icon="el-icon-camera" @click="handphotograph(scope.row)">拍照</el-button>
+                    <el-button type="text" icon="el-icon-camera" v-if="userInfoVO.userType == '02'" @click="handphotograph(scope.row)">拍照</el-button>
                     <el-button type="text" icon="el-icon-printer" v-if="userInfoVO.userType == '02'" @click="btn_pointer_label(scope.row)">标签打印</el-button>
                 </template>
             </el-table-column>

admin-ui/src/views/order/retailOrder/index.vue

@@ -29,7 +29,7 @@
                 <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
         </el-form>
-        
+
 
         <el-row :gutter="10" class="mb8">
             <!--            <el-col :span="1.5">-->
@@ -118,6 +118,7 @@
                     <el-descriptions-item label="物流单号">{{ detailView.deliveryNo ? detailView.deliveryNo : '暂无信息' }} </el-descriptions-item>
                     <el-descriptions-item label="收货地址" span="3">{{ detailView.province }}{{ detailView.city }}{{ detailView.area }}{{ detailView.address }}{{ detailView.addressDetail }} </el-descriptions-item>
                     <el-descriptions-item label="备注信息" span="3">{{ detailView.deliveryNo ? detailView.deliveryNo : '暂无信息' }} </el-descriptions-item>
+                  <el-descriptions-item label="退款备注" span="3" v-if="detailView.refundReason">{{ detailView.refundReason ? detailView.refundReason : '暂无信息' }} </el-descriptions-item>
                 </el-descriptions>
             </el-card>
             <div class="product-list-container">

admin-ui/src/views/system/store/add_store.vue

@@ -29,7 +29,6 @@
                     v-model="formData.storeType"
                     placeholder="请选择门店类型"
                     @change="changeStoreType"
-                    :disabled="isEditMode"
                     style="width: 100%"
                   >
                     <el-option
@@ -99,6 +98,15 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="手机号码" prop="contactPhone">
+                  <el-input
+                    v-model="formData.contactPhone"
+                    placeholder="请输入负责人手机"
+                    clearable
+                  />
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="负责人职务" prop="contactPost">
                   <el-input
@@ -126,15 +134,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="手机号码" prop="contactPhone">
-                  <el-input
-                    v-model="formData.contactPhone"
-                    placeholder="请输入负责人手机"
-                    clearable
-                  />
-                </el-form-item>
-              </el-col>
+
               <el-col :span="8">
                 <el-form-item label="电子邮箱" prop="contactEmail">
                   <el-input
@@ -526,6 +526,13 @@ export default {
             trigger: 'change'
           }
         ],
+        storeType: [
+          {
+            required: true,
+            message: '请选择类型',
+            trigger: 'change'
+          }
+        ],
         contactName: [
           {
             required: true,
@@ -540,13 +547,13 @@ export default {
         //     trigger: 'blur'
         //   }
         // ],
-        contactIdcard: [
-          {
-            required: true,
-            trigger: 'blur',
-            validator: this.checkIdCardNumber
-          }
-        ],
+        // contactIdcard: [
+        //   {
+        //     required: true,
+        //     trigger: 'blur',
+        //     validator: this.checkIdCardNumber
+        //   }
+        // ],
         contactPhone: [
           {
             required: true,

admin-ui/src/views/system/store/index.vue

@@ -11,6 +11,12 @@
                         <el-option v-for="item in factorys" :label="item.factoryName" :value="item.id" :key="item.factoryName" />
                     </el-select>
                 </el-form-item>
+              <el-form-item label="门店状态">
+                <el-select v-model="queryParams.status" placeholder="请选择门店状态" clearable style="width: 220px">
+                  <el-option :key="0" label="启用" value="0" />
+                  <el-option :key="1" label="禁用" value="1" />
+                </el-select>
+              </el-form-item>
                 <el-form-item label="门店类型">
                     <el-select v-model="queryParams.storeType" placeholder="请选择门店类型" clearable style="width: 220px">
                         <el-option v-for="dict in dict.type.sys_store_type" :key="dict.value" :label="dict.label" :value="dict.value" />

yiqi-common/src/main/java/com/yiqi/common/enums/OrderRefundStatus.java

@@ -8,9 +8,9 @@ public enum OrderRefundStatus {
     REFUND_APPLYING("1", "退款申请中"),
     REFUNDING("2", "退款中"),
     REFUND_SUCCESS("3", "退款成功"),
-    ERROR("-1", "退款异常"),
+    REFUND_CANCEL("-1", "退款取消"),
     REFUND_REFUSE("-2", "退款驳回"),
-    REFUND_CANCEL("-3", "退款取消"),
+    ERROR("-3", "退款失败"),
     ;
 
     private final String code;

yiqi-common/src/main/java/com/yiqi/order/domain/OrderRechargeRefund.java

@@ -163,7 +163,7 @@ public class OrderRechargeRefund extends BaseEntity
 
     /** 退卡状态（-1：退款失败 0:申请中 1：退款通过） */
     @Excel(name = "退卡状态", readConverterExp = "0=正常，1=退款申请中，2=退款同意，3=退款拒绝，4=退款取消")
-    @ApiModelProperty("退卡状态（0=正常，1=退款申请中，2=退款同意，3=退款拒绝，4=退款取消）")
+    @ApiModelProperty("退卡状态（0=正常，1=退款申请中，2=退款同意，-2=退款拒绝，-3=退款取消）")
     private String refundStatus;
 
     /** 驳回原因 */

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

@@ -101,6 +101,9 @@ public class GoodsOrderInfoVO {
     @ApiModelProperty("地址")
     private String address;
 
+    @ApiModelProperty("退款原因")
+    private String refundReason;
+
     @ApiModelProperty("门牌号")
     private String addressDetail;
 

yiqi-system/src/main/resources/mapper/system/SysStoreMapper.xml

@@ -71,7 +71,7 @@
                 and store.city_id = #{cityId}
             </if>
             <if test="status != null  and status != ''">
-                and status = #{status}
+                and store.status = #{status}
             </if>
         </where>
     </select>