bug修复

admin-ui/.env.development

@@ -5,10 +5,10 @@ VUE_APP_TITLE = 一七管理系统
 ENV = 'development'
 
 
-# VUE_APP_BASE_API_HOST = 'http://192.168.5.176:9801'
-# VUE_APP_BASE_API = 'http://192.168.5.176: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/views/activity/couponInfo/index.vue

@@ -89,11 +89,12 @@
                 </el-table-column>
                 <el-table-column label="创建时间" align="center" prop="createTime" width="150" />
 
-                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
+                <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
                     <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-s-shop" @click="handleSetCouponItems(scope.row)">设置优惠券</el-button>
-                        <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                        <el-button type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>
+                        <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" >修改</el-button>
+                        <el-button type="text" icon="el-icon-s-shop"  @click="handleSetCouponItems(scope.row)" >设置优惠券</el-button>
+                        <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" >删除</el-button>
                     </template>
                 </el-table-column>
             </Page>
@@ -189,6 +190,41 @@
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
+
+        <!-- 详情弹窗 -->
+        <el-dialog title="活动详情" :visible.sync="viewOpen" width="800px" append-to-body>
+            <el-descriptions class="margin-top" :column="2" border>
+                <el-descriptions-item label="活动标题">{{ viewForm.title }}</el-descriptions-item>
+                <el-descriptions-item label="活动状态">
+                    <dict-tag :options="dict.type.sys_normal_disable" :value="viewForm.status" />
+                </el-descriptions-item>
+                <el-descriptions-item label="活动价格">¥{{ viewForm.price }}</el-descriptions-item>
+                <el-descriptions-item label="购买限制">
+                    <span v-if="viewForm.maxBuyNum === 9999">不限</span>
+                    <span v-else>限购{{ viewForm.maxBuyNum }}张</span>
+                </el-descriptions-item>
+                <el-descriptions-item label="活动时间">
+                    {{ parseTime(viewForm.startDate, '{y}-{m}-{d}') }} 至 {{ parseTime(viewForm.endDate, '{y}-{m}-{d}') }}
+                </el-descriptions-item>
+                <el-descriptions-item label="优惠券数量">{{ viewForm.couponNum }}张</el-descriptions-item>
+                <el-descriptions-item label="适用用户">
+                    <dict-tag :options="dict.type.activity_user_scope" :value="viewForm.userScope" />
+                </el-descriptions-item>
+                <el-descriptions-item label="使用范围">
+                    <dict-tag :options="dict.type.coupon_use_range" :value="viewForm.storeScope" />
+                </el-descriptions-item>
+                <el-descriptions-item :span="2" label="活动描述">{{ viewForm.description }}</el-descriptions-item>
+                <el-descriptions-item :span="2" label="活动图片">
+                    <image-preview :src="viewForm.imgUrl" :width="200" :height="100" />
+                </el-descriptions-item>
+                <el-descriptions-item :span="2" label="活动详情">
+                    <div v-html="viewForm.content"></div>
+                </el-descriptions-item>
+            </el-descriptions>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="viewOpen = false">关 闭</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -283,7 +319,11 @@ export default {
             },
             activeTab: 'basic',
             // 是否正在关闭
-            isClosing: false
+            isClosing: false,
+            // 是否显示详情弹出层
+            viewOpen: false,
+            // 详情表单参数
+            viewForm: {}
         }
     },
     created() {
@@ -568,6 +608,11 @@ export default {
             } else {
                 this.form.maxBuyNum = 1
             }
+        },
+        /** 查看按钮操作 */
+        handleView(row) {
+            this.viewForm = { ...row }
+            this.viewOpen = true
         }
     }
 }

admin-ui/src/views/order/serviceOrder/carBeautyOrder.vue

@@ -6,7 +6,7 @@
             </el-form-item>
             <el-form-item label="订单状态" prop="orderStatus">
                 <el-select v-model="queryParams.orderStatus" placeholder="请选择支付状态" clearable>
-                    <el-option v-for="dict in dict.type.order_goods_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    <el-option v-for="dict in dict.type.order_service_goods_status" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item>
             <el-form-item label="客户姓名" prop="realName">
@@ -63,7 +63,7 @@
             </el-table-column>
             <el-table-column label="订单状态" align="center" prop="orderStatus" width="100">
                 <template slot-scope="scope">
-                    <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus" />
+                    <dict-tag :options="dict.type.order_service_goods_status" :value="scope.row.orderStatus" />
                 </template>
             </el-table-column>
             <el-table-column label="下单时间" align="center" prop="createTime" width="150px" />
@@ -96,7 +96,7 @@
                     <el-descriptions-item label="客户姓名">{{ detailView.realName }}</el-descriptions-item>
                     <el-descriptions-item label="客户手机号">{{ detailView.phoneNumber }}</el-descriptions-item>
                     <el-descriptions-item label="订单状态">
-                        <dict-tag :options="dict.type.order_goods_status" :value="detailView.orderStatus" />
+                        <dict-tag :options="dict.type.order_service_goods_status" :value="detailView.orderStatus" />
                     </el-descriptions-item>
                     <el-descriptions-item label="收货联系人">{{ detailView.contactName ? detailView.contactName : '暂无信息' }}</el-descriptions-item>
                     <el-descriptions-item label="收货人手机号">{{ detailView.contactPhone ? detailView.contactPhone : '暂无信息' }}</el-descriptions-item>
@@ -150,7 +150,7 @@ import { printGoods } from '@/api/order/clothItem'
 
 export default {
     name: 'carBeautyOrder',
-    dicts: ['order_goods_status', 'delivery_company', 'recharge_pay_type'],
+    dicts: ['order_service_goods_status', 'delivery_company', 'recharge_pay_type'],
     data() {
         return {
             userInfoVO: null,

admin-ui/src/views/order/serviceOrder/lifeServicesOrder.vue

@@ -6,7 +6,7 @@
             </el-form-item>
             <el-form-item label="订单状态" prop="orderStatus">
                 <el-select v-model="queryParams.orderStatus" placeholder="请选择支付状态" clearable>
-                    <el-option v-for="dict in dict.type.order_goods_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    <el-option v-for="dict in dict.type.order_service_goods_status" :key="dict.value" :label="dict.label" :value="dict.value" />
                 </el-select>
             </el-form-item>
             <el-form-item label="客户姓名" prop="realName">
@@ -62,7 +62,7 @@
             </el-table-column>
             <el-table-column label="订单状态" align="center" prop="orderStatus" width="100">
                 <template slot-scope="scope">
-                    <dict-tag :options="dict.type.order_goods_status" :value="scope.row.orderStatus" />
+                    <dict-tag :options="dict.type.order_service_goods_status" :value="scope.row.orderStatus" />
                 </template>
             </el-table-column>
             <el-table-column label="下单时间" align="center" prop="createTime" width="150px" />
@@ -89,7 +89,7 @@
                     <el-descriptions-item label="客户姓名">{{ detailView.realName }}</el-descriptions-item>
                     <el-descriptions-item label="客户手机号">{{ detailView.phoneNumber }}</el-descriptions-item>
                     <el-descriptions-item label="订单状态">
-                        <dict-tag :options="dict.type.order_goods_status" :value="detailView.orderStatus" />
+                        <dict-tag :options="dict.type.order_service_goods_status" :value="detailView.orderStatus" />
                     </el-descriptions-item>
                     <el-descriptions-item label="收货联系人">{{ detailView.contactName ? detailView.contactName : '暂无信息' }}</el-descriptions-item>
                     <el-descriptions-item label="收货人手机号">{{ detailView.contactPhone ? detailView.contactPhone : '暂无信息' }}</el-descriptions-item>
@@ -144,7 +144,7 @@ import { printGoods } from '@/api/order/clothItem'
 
 export default {
     name: 'lifeServicesOrder',
-    dicts: ['order_goods_status', 'delivery_company', 'recharge_pay_type'],
+    dicts: ['order_service_goods_status', 'delivery_company', 'recharge_pay_type'],
     data() {
         return {
             userInfoVO: null,

admin-ui/src/views/workbench/workAppointmentOrder/index.vue

@@ -2,20 +2,16 @@
   <div class="app-container">
     <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" />
+        <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item prop="appointmentTime">
-        <el-date-picker clearable v-model="queryParams.appointmentTime" type="date" value-format="yyyy-MM-dd"
-                        placeholder="请选择创建时间"></el-date-picker>
+        <el-date-picker clearable v-model="queryParams.appointmentTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择创建时间"></el-date-picker>
       </el-form-item>
       <el-form-item prop="contactName">
-        <el-input v-model="queryParams.contactName" placeholder="请输入客户名称" clearable
-                  @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.contactName" placeholder="请输入客户名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item prop="contactPhone" label-width="90px">
-        <el-input v-model="queryParams.contactPhone" placeholder="请输入客户手机号" clearable
-                  @keyup.enter.native="handleQuery" />
+        <el-input v-model="queryParams.contactPhone" placeholder="请输入客户手机号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -27,7 +23,7 @@
     </el-row>
 
     <el-tabs type="border-card" v-model="virtualListStatus" @tab-click="changeOrderStatus">
-      <el-tab-pane label="待接单" :name="'0'" ></el-tab-pane>
+      <el-tab-pane label="待接单" :name="'0'"></el-tab-pane>
       <el-tab-pane label="取衣中" :name="'1'"></el-tab-pane>
       <el-tab-pane label="待支付" :name="'4'"></el-tab-pane>
       <el-tab-pane label="待入厂" :name="'5'"></el-tab-pane>
@@ -45,6 +41,11 @@
             <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isLargeItem" />
           </template>
         </el-table-column>
+        <el-table-column label="大件类型" align="center" width="100px">
+          <template slot-scope="scope">
+            <div>{{ scope.row.largeItemType || "--" }}</div>
+          </template>
+        </el-table-column>
         <el-table-column label="是否拆装" align="center" width="100px">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isDisassemblyAndAssembly" />
@@ -103,17 +104,16 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
           <template slot-scope="scope">
             <el-button type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                       v-if="scope.row.orderStatus == '0' || scope.row.orderStatus == '9'">派单
+              v-if="scope.row.orderStatus == '0' || scope.row.orderStatus == '9'">派单
             </el-button>
-            <el-button type="text" icon="el-icon-delete" @click="handleCancel(scope.row)"
-                       v-if="scope.row.deliveryStatus == '10000'">取消订单
+            <el-button type="text" icon="el-icon-delete" @click="handleCancel(scope.row)" v-if="scope.row.deliveryStatus == '10000'">取消订单
             </el-button>
+            <el-button type="text" icon="el-icon-view" @click="handleDetail(scope.row)">详情</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-                  @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
 
       <!-- 添加或修改洗衣订单对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="40%" append-to-body>
@@ -130,8 +130,7 @@
             <el-col :span="24" v-if="form.service_trans_id == 1">
               <el-form-item label="配送员" prop="takeClothAppUserId">
                 <el-select v-model="form.takeClothAppUserId" placeholder="请选择配送员" clearable>
-                  <el-option v-for="man in deliveryManList" :key="man.appUserId" :label="man.realName"
-                             :value="man.appUserId" />
+                  <el-option v-for="man in deliveryManList" :key="man.appUserId" :label="man.realName" :value="man.appUserId" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -154,8 +153,7 @@
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 配送订单状态</template>
-              <dict-tag :options="dict.type.intracity_express_order_status"
-                        :value="intracityExpressOrderInfo.order_status" />
+              <dict-tag :options="dict.type.intracity_express_order_status" :value="intracityExpressOrderInfo.order_status" />
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label"> 配送距离</template>
@@ -219,18 +217,6 @@
               <template slot="label"> 取件地址</template>
               {{ intracityExpressOrderInfo.store_info ? intracityExpressOrderInfo.store_info.address : '' }}
             </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label"> 收件人姓名</template>
-              {{ intracityExpressOrderInfo.receiver_info ? intracityExpressOrderInfo.receiver_info.receiver_name : '' }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label"> 收件人电话</template>
-              {{ intracityExpressOrderInfo.receiver_info ? intracityExpressOrderInfo.receiver_info.phone_num : '' }}
-            </el-descriptions-item>
-            <el-descriptions-item :span="2">
-              <template slot="label"> 收件地址</template>
-              {{ intracityExpressOrderInfo.receiver_info ? intracityExpressOrderInfo.receiver_info.address : '' }}
-            </el-descriptions-item>
           </el-descriptions>
         </el-col>
       </el-row>
@@ -241,44 +227,32 @@
     </el-dialog>
 
     <!-- 订单出货对话框 -->
-    <el-dialog title="订单出货信息" :visible.sync="openDeliveryPage" size="40%" append-to-body
-               :before-close="deliveryClose">
+    <el-dialog title="订单出货信息" :visible.sync="openDeliveryPage" size="40%" append-to-body :before-close="deliveryClose">
       <el-row :gutter="15">
         <el-form ref="deliveryVo" :model="deliveryVo" :rules="deliveryRules" label-width="120px">
           <el-col :span="24">
             <el-form-item label="快递公司" prop="deliveryCompany">
               <el-radio-group v-model="deliveryVo.deliveryCompany" @input="changeDeliveryId">
-                <el-radio-button v-for="dict in deliveryData" :label="dict.deliveryName"
-                                 :key="dict.deliveryName"></el-radio-button>
+                <el-radio-button v-for="dict in deliveryData" :label="dict.deliveryName" :key="dict.deliveryName"></el-radio-button>
               </el-radio-group>
             </el-form-item>
 
             <el-form-item label="服务类型" prop="serviceType">
               <div class="servicecard" v-for="del in serviceData" :key="del.serviceType" @click="checkserviceId(del)"
-                   :class="{ active: deliveryVo.serviceType == del.serviceType }">
+                :class="{ active: deliveryVo.serviceType == del.serviceType }">
                 <div class="check"><i class="el-icon-check"></i></div>
                 {{ del.serviceName }}
               </div>
             </el-form-item>
 
             <el-form-item label="预期揽件时间" prop="expectTime">
-              <el-date-picker
-                type="datetime"
-                placeholder="选择预期揽件时间"
-                v-model="deliveryVo.expectTime"
-                style="width: 100%"
-                value-format="yyyy-MM-dd HH:mm"
-                format="yyyy-MM-dd HH:mm"
-                :picker-options="{
+              <el-date-picker type="datetime" placeholder="选择预期揽件时间" v-model="deliveryVo.expectTime" style="width: 100%"
+                value-format="yyyy-MM-dd HH:mm" format="yyyy-MM-dd HH:mm" :picker-options="{
                                     disabledDate: (time) => {
                                         return time.getTime() < Date.now() - 3600 * 1000 * 24
                                     },
                                     selectableRange: startTimeRange
-                                }"
-                :default-time="deliTime"
-                class="date_picker"
-                :editable="false"
-              ></el-date-picker>
+                                }" :default-time="deliTime" class="date_picker" :editable="false"></el-date-picker>
             </el-form-item>
 
             <!-- <el-form-item label="包裹数量" prop="count">
@@ -310,9 +284,8 @@
             </el-form-item>
 
             <el-form-item label="备注信息" prop="customRemark">
-              <el-input v-model="deliveryVo.customRemark" rows="5" type="textarea"
-                        placeholder="请输入备注信息，比如易碎物品……" maxlength="500" show-word-limit
-                        clearable></el-input>
+              <el-input v-model="deliveryVo.customRemark" rows="5" type="textarea" placeholder="请输入备注信息，比如易碎物品……" maxlength="500" show-word-limit
+                clearable></el-input>
             </el-form-item>
           </el-col>
         </el-form>
@@ -325,8 +298,7 @@
     </el-dialog>
 
     <!-- 快递信息对话框 -->
-    <el-dialog title="快递信息" :visible.sync="openDeliveryinfo" size="40%" append-to-body
-               :before-close="deliveryinfoClose">
+    <el-dialog title="快递信息" :visible.sync="openDeliveryinfo" size="40%" append-to-body :before-close="deliveryinfoClose">
       <div class="deliveryView">
         <div class="info">
           <span>快递公司：</span>
@@ -350,6 +322,75 @@
         <el-button type="primary" style="margin-left: 5%" @click="openDeliveryinfo = false">关闭</el-button>
       </div>
     </el-dialog>
+
+    <!-- 订单详情对话框 -->
+    <el-dialog title="订单详情" :visible.sync="detailOpen" width="50%" append-to-body>
+      <el-descriptions class="margin-top" :column="2" border>
+        <el-descriptions-item>
+          <template slot="label">预约单号</template>
+          {{ detailInfo.orderNo }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">预约时间</template>
+          {{ detailInfo.appointmentTime }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">是否大件</template>
+          <dict-tag :options="dict.type.sys_yes_no" :value="detailInfo.isLargeItem" />
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">大件类型</template>
+          {{ detailInfo.largeItemType || "--" }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">是否拆装</template>
+          <dict-tag :options="dict.type.sys_yes_no" :value="detailInfo.isDisassemblyAndAssembly" />
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">件数</template>
+          {{ detailInfo.appointmentCount }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">客户姓名</template>
+          {{ detailInfo.contactName }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">客户电话</template>
+          {{ detailInfo.contactPhone }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">订单金额</template>
+          {{ detailInfo.payAmount > 0 ? detailInfo.payAmount : '未定价' }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">订单状态</template>
+          <dict-tag :options="dict.type.cloth_order_status" :value="detailInfo.orderStatus" />
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">取衣方式</template>
+          <dict-tag :options="dict.type.cloth_take_type" :value="detailInfo.takeClothWay" />
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">配送方式</template>
+          <dict-tag :options="dict.type.order_cloth_delivery_way" :value="detailInfo.deliveryWay" />
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">派送员</template>
+          {{ detailInfo.takeClothAppUserName || "--" }}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label">派送员手机号</template>
+          {{ detailInfo.takeClothAppUserPhone || "--" }}
+        </el-descriptions-item>
+        <el-descriptions-item :span="2">
+          <template slot="label">地址明细</template>
+          {{ detailInfo.address }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="detailOpen = false">关 闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -481,7 +522,9 @@ export default {
         ],
         customRemark: [{ required: true, message: '请输入备注信息，比如易碎物品……', trigger: 'blur' }]
       },
-      deliveryManList: []
+      deliveryManList: [],
+      detailOpen: false,
+      detailInfo: {}
     }
   },
   created() {
@@ -671,7 +714,7 @@ export default {
     },
     checkClose(done) {
       this.$confirm('是否关闭表单，关闭后数据将丢失？')
-        .then(function() {
+        .then(function () {
           done()
         })
         .then(() => {
@@ -742,7 +785,7 @@ export default {
     },
     deliveryClose(done) {
       this.$confirm('是否关闭出货信息窗口，确认关闭？')
-        .then(function() {
+        .then(function () {
           done()
         })
         .then(() => {
@@ -752,7 +795,7 @@ export default {
     },
     deliveryinfoClose(done) {
       this.$confirm('是否关闭快递信息窗口，确认关闭？')
-        .then(function() {
+        .then(function () {
           done()
         })
         .then(() => {
@@ -776,6 +819,10 @@ export default {
         })
         .catch(() => {
         })
+    },
+    handleDetail(row) {
+      this.detailInfo = row
+      this.detailOpen = true
     }
   }
 }
@@ -836,4 +883,3 @@ export default {
   }
 }
 </style>
-s

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

@@ -88,7 +88,7 @@ public class OrderClothItemController extends BaseController {
     @PostMapping(value = "saveOrderClothPics")
     @ApiOperation("保存衣服图片")
     public R saveOrderClothPics(@RequestParam @ApiParam("衣服图片集合，『，』分割")
-                                String pics, @RequestParam @ApiParam("订单衣服ID") Long id) throws Exception {
+                                        String pics, @RequestParam @ApiParam("订单衣服ID") Long id) throws Exception {
         OrderClothItem orderClothItem = orderClothItemService.getOne(new QueryWrapper<OrderClothItem>().lambda()
                 .eq(OrderClothItem::getId, id)
                 .eq(OrderClothItem::getOrgId, SecurityUtils.getLoginUser().getOrgId())
@@ -165,7 +165,7 @@ public class OrderClothItemController extends BaseController {
             }
 
             orderClothItemService.update(new UpdateWrapper<OrderClothItem>().lambda()
-                    .set(OrderClothItem::getFlowStatus, ClothOrderFlowStatus.reWash.getCode())
+                    .setSql("repeat_count = repeat_count + 1, flow_status = '1' ")
                     .eq(OrderClothItem::getWashCode, washCode));
 
             //记录日志
@@ -181,12 +181,10 @@ public class OrderClothItemController extends BaseController {
                         + EnumUtils.getEnumByType(orderClothAdjunct.getFlowStatus(), ClothOrderFlowStatus.class).getInfo() + "】");
             }
             orderClothAdjunctService.update(new UpdateWrapper<OrderClothAdjunct>().lambda()
-                    .set(OrderClothAdjunct::getFlowStatus, ClothOrderFlowStatus.reWash.getCode())
+                    .setSql("repeat_count = repeat_count + 1, flow_status = '1'")
                     .eq(OrderClothAdjunct::getAdjunctNo, washCode));
             orderClothItemFlowRecordService.addAdjunctRecord(orderClothAdjunct, ClothOrderFlowStatus.reWash.getCode());
         }
-
-
         return R.ok();
     }
 

yiqi-api/src/main/java/com/yiqi/api/controller/order/WeAppOrderClothController.java

@@ -195,6 +195,7 @@ public class WeAppOrderClothController {
         orderCloth.setAppUserId(AuthHolder.userId());
         orderCloth.setDelFlag(DeleteStatus.OK.getCode());
         orderCloth.setOrderStatus(ClothOrderStatusType.APPOINTMENT.getCode());
+        orderCloth.setIsDisassemblyAndAssembly(StringUtils.isEmpty(orderClothAppointmentDTO.getIsDismountingAndAssembling()) ? SysBoolType.NO.getCode() : orderClothAppointmentDTO.getIsDismountingAndAssembling());
         // 预约单
         orderCloth.setIsAppointment(SysBoolType.YES.getCode());
         orderCloth.setOrderNo(orderNoUtils.getClothOrderNo());

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

@@ -24,17 +24,20 @@ import lombok.Data;
 @ApiModel("洗衣订单")
 @TableName("order_cloth")
 @Data
-public class OrderCloth extends BaseEntity
-{
-    private static final long serialVersionUID=1L;
+public class OrderCloth extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** 主键ID */
+    /**
+     * 主键ID
+     */
     @ApiModelProperty("主键ID")
 
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    /** 订单编号 */
+    /**
+     * 订单编号
+     */
     @Excel(name = "订单编号")
     @ApiModelProperty("订单编号")
     private String orderNo;
@@ -42,45 +45,61 @@ public class OrderCloth extends BaseEntity
     @ApiModelProperty("订单类型（0=普通订单，1=云洗订单，2=第三方订单）,默认0")
     private String orderType;
 
-    /** 门店/工厂ID */
+    /**
+     * 门店/工厂ID
+     */
     @Excel(name = "门店")
     @ApiModelProperty("门店")
 
     private Long orgId;
 
-    /** 来源类型 */
+    /**
+     * 来源类型
+     */
     @Excel(name = "来源类型")
     @ApiModelProperty("来源类型")
     private String sourceType;
 
-    /** 工厂ID */
+    /**
+     * 工厂ID
+     */
     @Excel(name = "工厂ID")
     @ApiModelProperty("工厂ID")
 
     private Long factoryId;
 
-    /** 客户ID */
+    /**
+     * 客户ID
+     */
     @Excel(name = "客户ID")
     @ApiModelProperty("客户ID")
 
     private Long appUserId;
 
-    /** 联系人 */
+    /**
+     * 联系人
+     */
     @Excel(name = "联系人")
     @ApiModelProperty("联系人")
     private String contactName;
 
-    /** 联系人手机号 */
+    /**
+     * 联系人手机号
+     */
     @Excel(name = "联系人手机号")
     @ApiModelProperty("联系人手机号")
     private String contactPhone;
 
-    /** 订单总金额 */
+    /**
+     * 订单总金额
+     */
     @Excel(name = "订单总金额")
     @ApiModelProperty("订单总金额")
     private BigDecimal orderAmount;
 
-    /** 支付信息 */
+    /**
+     * 支付信息
+     */
     @Excel(name = "支付信息")
     @ApiModelProperty("支付信息")
     private String payInfo;
@@ -93,7 +112,9 @@ public class OrderCloth extends BaseEntity
     @ApiModelProperty("衣服件数")
     private Integer orderClothCount;
 
-    /** 支付金额 */
+    /**
+     * 支付金额
+     */
     @Excel(name = "支付金额")
     @ApiModelProperty("支付金额")
     private BigDecimal payAmount;
@@ -103,7 +124,9 @@ public class OrderCloth extends BaseEntity
     private String payTimeType;
 
 
-    /** 支付方式（0=微信，1=支付宝，2=现金，3=储值卡） */
+    /**
+     * 支付方式（0=微信，1=支付宝，2=现金，3=储值卡）
+     */
     @Excel(name = "支付方式", readConverterExp = "0==微信，1=支付宝，2=现金，3=储值卡")
     @ApiModelProperty("支付方式（0=微信，1=支付宝，2=现金，3=储值卡）")
     private String payType;
@@ -112,134 +135,180 @@ public class OrderCloth extends BaseEntity
     @ApiModelProperty("支付状态 0：待支付 1: 支付成功 -1：支付失败")
     private String payStatus;
 
-    /** 支付时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 支付时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("支付时间")
     private Date payTime;
 
-    /** 支付宝/微信支付订单号 */
+    /**
+     * 支付宝/微信支付订单号
+     */
     @Excel(name = "支付宝/微信支付订单号")
     @ApiModelProperty("支付宝/微信支付订单号")
     private String outTradeOrderNo;
 
-    /** 下单渠道（APP=APP，WXAPP=小程序，OFFLINE=线下门店） */
+    /**
+     * 下单渠道（APP=APP，WXAPP=小程序，OFFLINE=线下门店）
+     */
     @Excel(name = "下单渠道", readConverterExp = "A=PP=APP，WXAPP=小程序，OFFLINE=线下门店")
     @ApiModelProperty("下单渠道（APP=APP，WXAPP=小程序，OFFLINE=线下门店）")
     private String orderSource;
 
-    /** 退款金额 */
+    /**
+     * 退款金额
+     */
     @Excel(name = "退款金额")
     @ApiModelProperty("退款金额")
     private BigDecimal refundAmount;
 
-    /** 退款描述 */
+    /**
+     * 退款描述
+     */
     @Excel(name = "退款描述")
     @ApiModelProperty("退款描述")
     private String refundContent;
 
-    /** 预约时间（yyyy-MM-dd HH:mm） */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 预约时间（yyyy-MM-dd HH:mm）
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("预约时间")
     private Date appointmentTime;
 
-    /** 预约件数 */
+    /**
+     * 预约件数
+     */
     @Excel(name = "预约件数")
     @ApiModelProperty("预约件数")
     private Integer appointmentCount;
 
-    /** 是否预约订单 */
+    /**
+     * 是否预约订单
+     */
     @Excel(name = "是否预约订单")
     @ApiModelProperty("是否预约订单")
     private String isAppointment;
 
-    /** 订单状态（0. 待下单  1. 已下单待送衣   2. 洗衣中   3.衣服已到店待取衣   8. 取衣完成待评价  9.已完成   100. 已取消） */
+    /**
+     * 订单状态（0. 待下单  1. 已下单待送衣   2. 洗衣中   3.衣服已到店待取衣   8. 取衣完成待评价  9.已完成   100. 已取消）
+     */
     @Excel(name = "订单状态", readConverterExp = "0=预约处理中，1=已下单待送衣，2=洗衣中，3=衣服已到店待取衣，8=取衣完成待评价，9=已完成，-1=已取消")
     @ApiModelProperty("订单状态（0=预约待取，1=已取货、待门店定价，2=已定价、待支付，3=已支付、待工厂取货，4=工厂已取货、洗衣中，5=洗衣完成、待送店，6=已到店、待送衣，7=送衣中，8=已送达、待评价，9=已完成，-1=已取消）")
     private String orderStatus;
 
 
-    /** 取衣时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 取衣时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "取衣时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("取衣时间")
     private Date takeClothTime;
 
-    /** 取衣人 */
+    /**
+     * 取衣人
+     */
     @Excel(name = "取衣人")
     @ApiModelProperty("取衣人")
 
     private Long takeClothAppUserId;
 
-    /** 定价时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 定价时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "定价时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("定价时间")
     private Date setPriceTime;
 
-    /** 取货时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 取货时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "取货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("取货时间")
     private Date pickUpTime;
 
-    /** 开始洗衣时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 开始洗衣时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "开始洗衣时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("开始洗衣时间")
     private Date washClothStartTime;
 
-    /** 结束洗衣时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 结束洗衣时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "结束洗衣时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("结束洗衣时间")
     private Date washClothEndTime;
 
-    /** 送店时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 送店时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "送店时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("送店时间")
     private Date sendToStoreTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "预计取衣时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("预计取衣时间")
     private Date planSendToUserTime;
 
-    /** 取衣时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 取衣时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "取衣时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("取衣时间")
     private Date sendToUserTime;
 
-    /** 退款时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 退款时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("退款时间")
     private Date refundTime;
 
-    /** 退款状态（0=正常，1=退款申请中，2=退款同意，3=退款拒绝，4=退款取消） */
+    /**
+     * 退款状态（0=正常，1=退款申请中，2=退款同意，3=退款拒绝，4=退款取消）
+     */
     @Excel(name = "退款状态", readConverterExp = "0==正常，1=退款申请中，2=退款同意，3=退款拒绝，4=退款取消")
     @ApiModelProperty("退款状态（0=正常，1=退款申请中，2=退款同意，3=退款拒绝，4=退款取消）")
     private String refundStatus;
 
-    /** 退款原因 */
+    /**
+     * 退款原因
+     */
     @Excel(name = "退款原因")
     @ApiModelProperty("退款原因")
     private String refundReason;
 
-    /** 送衣人 */
+    /**
+     * 送衣人
+     */
     @Excel(name = "送衣人")
     @ApiModelProperty("送衣人")
 
     private Long sendClothAppUserId;
 
-    /** 收衣方式（0=到店，1=上门） */
+    /**
+     * 收衣方式（0=到店，1=上门）
+     */
     @Excel(name = "收衣方式", readConverterExp = "0==到店，1=上门")
     @ApiModelProperty("收衣方式（0=到店，1=上门）")
     private String takeClothWay;
 
-    /** 取衣方式（0=到店，1=上门） */
+    /**
+     * 取衣方式（0=到店，1=上门）
+     */
     @Excel(name = "取衣方式", readConverterExp = "0==到店，1=上门")
     @ApiModelProperty("取衣方式（0=到店，1=上门）")
     private String sendClothWay;
@@ -247,12 +316,16 @@ public class OrderCloth extends BaseEntity
     @ApiModelProperty("折扣活动ID")
     private Long discountActivityId;
 
-    /** 活动折扣金额 */
+    /**
+     * 活动折扣金额
+     */
     @Excel(name = "活动折扣金额")
     @ApiModelProperty("活动折扣金额")
     private BigDecimal activityDiscountAmount;
 
-    /** 优惠券抵扣金额 */
+    /**
+     * 优惠券抵扣金额
+     */
     @Excel(name = "优惠券抵扣金额")
     @ApiModelProperty("优惠券抵扣金额")
     private BigDecimal couponDeductAmount;
@@ -261,49 +334,72 @@ public class OrderCloth extends BaseEntity
     @ApiModelProperty("现金抵扣金额")
     private BigDecimal cashDeductAmount;
 
-    /** 订单完成 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    /**
+     * 订单完成
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "订单完成", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("订单完成")
     private Date finishTime;
 
-    /** 门店员工ID */
+    /**
+     * 门店员工ID
+     */
     @Excel(name = "门店员工ID")
     @ApiModelProperty("门店员工ID")
 
     private Long employeeId;
 
-    /** 删除状态（0=正常,2=删除） */
+    /**
+     * 删除状态（0=正常,2=删除）
+     */
     @ApiModelProperty("删除状态（0=正常,2=删除）")
     private String delFlag;
 
-    /** 是否拆装 */
+    /**
+     * 是否拆装
+     */
     @Excel(name = "是否拆装")
     @ApiModelProperty("是否拆装")
     private String isDisassemblyAndAssembly;
 
-    /** 是否大件 */
+    /**
+     * 是否大件
+     */
     @Excel(name = "是否大件")
     @ApiModelProperty("是否大件")
     private String isLargeItem;
 
-    /** 订单加急 */
+    /**
+     * 大件项目类型
+     */
+    private String largeItemType;
+
+    /**
+     * 订单加急
+     */
     @Excel(name = "订单加急")
     @ApiModelProperty("订单加急")
 
     private Long clothSpeedId;
 
-    /** 订单加急 */
+    /**
+     * 订单加急
+     */
     @Excel(name = "订单加急")
     @ApiModelProperty("订单加急")
     private String clothSpeedName;
 
-    /** 是否特殊 */
+    /**
+     * 是否特殊
+     */
     @Excel(name = "是否特殊")
     @ApiModelProperty("是否特殊")
     private String isSpecial;
 
-    /** 配送费 */
+    /**
+     * 配送费
+     */
     @Excel(name = "配送费")
     @ApiModelProperty("配送费")
     private BigDecimal deliveryAmount;

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

@@ -61,11 +61,20 @@ public class OrderClothAdjunct extends BaseEntity {
     @ApiModelProperty("订单ID")
     private Long orderId;
 
-    /** 退款订单ID */
+    /**
+     * 退款订单ID
+     */
     @Excel(name = "退款订单ID")
     @ApiModelProperty("退款订单ID")
     private Long refundId;
 
+    /**
+     * 重新次数
+     */
+    @Excel(name = "重新次数")
+    @ApiModelProperty("重新次数")
+    private Integer repeatCount;
+
     /**
      * 订单衣服ID
      */
@@ -83,15 +92,15 @@ public class OrderClothAdjunct extends BaseEntity {
     @ApiModelProperty("门店ID")
     private Long storeId;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("入厂时间")
     private Date inFactoryTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("检查时间")
     private Date checkClothTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("出厂时间")
     private Date outFactoryTime;
 

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

@@ -144,6 +144,11 @@ public class OrderClothAppointmentVO {
     @ApiModelProperty("配送公司名称")
     private String deliveryName;
 
+    /**
+     * 大件项目类型
+     */
+    private String largeItemType;
+
     @Excel(name = "预约地址")
     @ApiModelProperty("预约地址")
     private OrderClothAddress orderClothAddress;

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

@@ -317,6 +317,9 @@ public class OrderClothVO extends BaseEntity
     @ApiModelProperty("是否特殊")
     private String isSpecial;
 
+    @ApiModelProperty("大件项目类型")
+    private String largeItemType;
+
     @ApiModelProperty("配送金额")
     private BigDecimal deliveryAmount;
 

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

@@ -39,6 +39,12 @@ public class WeAppOrderClothAppointmentVO {
     @ApiModelProperty("是否大件")
     private String isLargeItem;
 
+    /**
+     * 大件项目类型
+     */
+    @ApiModelProperty("大件项目类型")
+    private String largeItemType;
+
     /** 预约时间（yyyy-MM-dd HH:mm） */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("预约时间")

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderClothServiceImpl.java

@@ -791,7 +791,6 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
             orderClothItem.setFactoryId(orderCloth.getFactoryId());
             orderClothItem.setWashCode(orderNoUtils.getClothWashCode());
             orderClothItem.setClothItemId(orderClothItemDTO.getClothItemId());
-            orderClothItem.setRepeatCount(0);
             orderClothItem.setClothItemName(orderClothItemDTO.getClothItemName());
             orderClothItem.setClothBrandId(orderClothItemDTO.getClothBrandId());
             orderClothItem.setClothBrandName(orderClothItemDTO.getClothBrandName());
@@ -815,7 +814,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
                 orderClothItem.setClothWashModeId(orderClothItemDTO.getClothWashModeId());
                 orderClothItem.setClothWashModeName(clothWashModeMap.get(orderClothItemDTO.getClothWashModeId()).getName());
             }
-
+            orderClothItem.setRepeatCount(0);
             orderClothItem.setPics(orderClothItemDTO.getPics());
             orderClothItem.setIsHedging(orderClothItemDTO.getIsHedging());
             orderClothItem.setHedgingPrice(orderClothItemDTO.getHedgingPrice());
@@ -900,6 +899,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
                         orderClothAdjunct.setOrderId(orderCloth.getId());
                         orderClothAdjunct.setFlowStatus(ClothOrderFlowStatus.waitingForWash.getCode());
                         orderClothAdjunct.setNum(1);
+                        orderClothAdjunct.setRepeatCount(0);
                         orderClothAdjunct.setFactoryId(orderCloth.getFactoryId());
                         orderClothAdjunct.setStoreId(orderCloth.getOrgId());
                         orderClothAdjunct.setOrderClothId(orderClothItems.get(i).getId());
@@ -912,6 +912,7 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
                     orderClothAdjunct.setAdjunctNo(orderNoUtils.getClothWashAdjustCode());
                     orderClothAdjunct.setOrderId(orderCloth.getId());
                     orderClothAdjunct.setStoreId(orderCloth.getOrgId());
+                    orderClothAdjunct.setRepeatCount(0);
                     orderClothAdjunct.setFactoryId(orderCloth.getFactoryId());
                     orderClothAdjunct.setFlowStatus(ClothOrderFlowStatus.waitingForWash.getCode());
                     orderClothAdjunct.setOrderClothId(orderClothItems.get(i).getId());