修复代码

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgOrder/controller/MsgOrderController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 订单表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2025-01-25
  * @Version: V1.0
  */
 @Api(tags="订单表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgOrder/entity/MsgOrder.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 订单表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2025-01-25
  * @Version: V1.0
  */
 @Data
@@ -70,6 +70,11 @@ public class MsgOrder implements Serializable {
 	@Excel(name = "下单地址", width = 15)
     @ApiModelProperty(value = "下单地址")
     private java.lang.String address;
+	/**地址标识*/
+	@Excel(name = "地址标识", width = 15, dictTable = "msg_address", dicText = "address_detail", dicCode = "id")
+	@Dict(dictTable = "msg_address", dicText = "address_detail", dicCode = "id")
+    @ApiModelProperty(value = "地址标识")
+    private java.lang.String addressId;
 	/**总计时间*/
 	@Excel(name = "总计时间", width = 15)
     @ApiModelProperty(value = "总计时间")
@@ -115,11 +120,10 @@ public class MsgOrder implements Serializable {
 	@Excel(name = "订单备注", width = 15)
     @ApiModelProperty(value = "订单备注")
     private java.lang.String remark;
-	/**地址标识*/
-	@Excel(name = "地址标识", width = 15, dictTable = "msg_address", dicText = "address", dicCode = "id")
-	@Dict(dictTable = "msg_address", dicText = "address", dicCode = "id")
-    @ApiModelProperty(value = "地址标识")
-    private java.lang.String addressId;
+	/**地址明细*/
+	@Excel(name = "地址明细", width = 15)
+    @ApiModelProperty(value = "地址明细")
+    private java.lang.String addressDetails;
 	/**优惠券标识*/
 	@Excel(name = "优惠券标识", width = 15, dictTable = "msg_coupon", dicText = "money", dicCode = "id")
 	@Dict(dictTable = "msg_coupon", dicText = "money", dicCode = "id")
@@ -169,7 +173,7 @@ public class MsgOrder implements Serializable {
 	/**服务下单时间*/
 	@Excel(name = "服务下单时间", width = 15)
     @ApiModelProperty(value = "服务下单时间")
-    private java.util.Date serviceTime;
+    private java.lang.String serviceTime;
 	/**用户评价*/
 	@Excel(name = "用户评价", width = 15)
     @ApiModelProperty(value = "用户评价")
@@ -179,9 +183,7 @@ public class MsgOrder implements Serializable {
     @ApiModelProperty(value = "技师评价")
     private java.lang.Integer jsEvaluated;
 	/**服务日期*/
-//	@Excel(name = "服务日期", width = 15, format = "yyyy-MM-dd")
-//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-//    @DateTimeFormat(pattern="yyyy-MM-dd")
+
     @ApiModelProperty(value = "服务日期")
     private java.lang.String serviceDate;
 	/**分销商所得(一级)*/

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgOrder/mapper/MsgOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 订单表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2025-01-25
  * @Version: V1.0
  */
 public interface MsgOrderMapper extends BaseMapper<MsgOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgOrder/service/IMsgOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 订单表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2025-01-25
  * @Version: V1.0
  */
 public interface IMsgOrderService extends IService<MsgOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgOrder/service/impl/MsgOrderServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 订单表
  * @Author: jeecg-boot
- * @Date:   2024-08-10
+ * @Date:   2025-01-25
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgOrder/vue/MsgOrderList.vue

@@ -185,6 +185,11 @@
             align:"center",
             dataIndex: 'address'
           },
+          {
+            title:'地址标识',
+            align:"center",
+            dataIndex: 'addressId_dictText'
+          },
           {
             title:'总计时间',
             align:"center",
@@ -235,11 +240,6 @@
             align:"center",
             dataIndex: 'remark'
           },
-          {
-            title:'地址标识',
-            align:"center",
-            dataIndex: 'addressId_dictText'
-          },
           {
             title:'优惠券标识',
             align:"center",
@@ -387,6 +387,7 @@
         fieldList.push({type:'string',value:'phone',text:'电话',dictCode:''})
         fieldList.push({type:'datetime',value:'payTime',text:'支付时间'})
         fieldList.push({type:'string',value:'address',text:'下单地址',dictCode:''})
+        fieldList.push({type:'sel_search',value:'addressId',text:'地址标识',dictTable:"msg_address", dictText:'address_detail', dictCode:'id'})
         fieldList.push({type:'int',value:'useTime',text:'总计时间',dictCode:''})
         fieldList.push({type:'string',value:'terName',text:'技师名称',dictCode:''})
         fieldList.push({type:'int',value:'state',text:'订单状态',dictCode:'order_state'})
@@ -397,7 +398,6 @@
         fieldList.push({type:'string',value:'projectName',text:'项目名称',dictCode:''})
         fieldList.push({type:'int',value:'payType',text:'支付方式',dictCode:'order_pay'})
         fieldList.push({type:'string',value:'remark',text:'订单备注',dictCode:''})
-        fieldList.push({type:'sel_search',value:'addressId',text:'地址标识',dictTable:"msg_address", dictText:'address', dictCode:'id'})
         fieldList.push({type:'sel_search',value:'couponId',text:'优惠券标识',dictTable:"msg_coupon", dictText:'money', dictCode:'id'})
         fieldList.push({type:'int',value:'tenState',text:'技师状态',dictCode:'ten_state'})
         fieldList.push({type:'switch',value:'tenOk',text:'技师是否接单'})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgOrder/vue/modules/MsgOrderForm.vue

@@ -28,6 +28,11 @@
               <a-input v-model="model.address" placeholder="请输入下单地址"  ></a-input>
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="地址标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressId">
+              <j-search-select-tag v-model="model.addressId" dict="msg_address,address_detail,id"  />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="总计时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="useTime">
               <a-input-number v-model="model.useTime" placeholder="请输入总计时间" style="width: 100%" />
@@ -78,11 +83,6 @@
               <a-input v-model="model.remark" placeholder="请输入订单备注"  ></a-input>
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="地址标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="addressId">
-              <j-search-select-tag v-model="model.addressId" dict="msg_address,address,id"  />
-            </a-form-model-item>
-          </a-col>
           <a-col :span="24">
             <a-form-model-item label="优惠券标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="couponId">
               <j-search-select-tag v-model="model.couponId" dict="msg_coupon,money,id"  />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/msgOrder/vue3/MsgOrder.data.ts

@@ -35,6 +35,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'address'
    },
+   {
+    title: '地址标识',
+    align:"center",
+    dataIndex: 'addressId_dictText'
+   },
    {
     title: '总计时间',
     align:"center",
@@ -85,11 +90,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'remark'
    },
-   {
-    title: '地址标识',
-    align:"center",
-    dataIndex: 'addressId_dictText'
-   },
    {
     title: '优惠券标识',
     align:"center",
@@ -267,6 +267,14 @@ export const formSchema: FormSchema[] = [
     field: 'address',
     component: 'Input',
   },
+  {
+    label: '地址标识',
+    field: 'addressId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"msg_address,address_detail,id"
+    },
+  },
   {
     label: '总计时间',
     field: 'useTime',
@@ -332,14 +340,6 @@ export const formSchema: FormSchema[] = [
     field: 'remark',
     component: 'Input',
   },
-  {
-    label: '地址标识',
-    field: 'addressId',
-    component: 'JSearchSelect',
-    componentProps:{
-       dict:"msg_address,address,id"
-    },
-  },
   {
     label: '优惠券标识',
     field: 'couponId',

jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/OrderCreateVipServiceImpl.java

@@ -290,8 +290,6 @@ public class OrderCreateVipServiceImpl implements OrderCreateVipService {
             return Result.error("订单已支付");
         }
 
-
-
         //根据订单查询项目是否存在
         MsgShop msgShop = msgShopService.getById(msgOrder.getProjectId());
         if(msgShop == null){
@@ -313,10 +311,12 @@ public class OrderCreateVipServiceImpl implements OrderCreateVipService {
         if(msgAddress== null){
             return Result.error("当前地址不存在");
         }
+        msgOrder.setAddressDetails(msgAddress.getAddressDetail());
         //预约服务时间不能为空 :这里的逻辑待定 - 需要跟前端讨论，目前就值存字符串时间
         if(bean.getServiceTime() == null){
             return Result.error("预约服务时间不能为空");
         }
+        msgOrder.setServiceTime(bean.getServiceTime());
         //出行方式不能为空
         if(bean.getTravelType() == null){
             return Result.error("出行方式不能为空");
@@ -1502,7 +1502,7 @@ public class OrderCreateVipServiceImpl implements OrderCreateVipService {
                     .eq(MsgOrder::getState, pageBean.getState())
                     //根据服务时间查询
                     .isNotNull(MsgOrder::getAddressId)
-                    .eq(MsgOrder::getServiceDate, pageBean.getServiceDate())
+//                    .like(MsgOrder::getServiceDate, pageBean.getServiceDate())
                     .orderByDesc(MsgOrder::getCreateTime)
                    .page(page);
         }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/UserVipApiServiceImpl.java

@@ -136,6 +136,9 @@ public class UserVipApiServiceImpl implements UserVipApiService {
     //商户入驻
     @Resource
     private IMsgDistributorService msgDistributorService;
+    //获取技师项目配置数据
+    @Resource
+    private IMsgShopConfigService msgShopConfigService;
 
 
 
@@ -189,12 +192,22 @@ public class UserVipApiServiceImpl implements UserVipApiService {
         MsgShop byId = msgShopService.getById(id);
         map.put("details",byId);
         //根据项目所配置的信息查询技师列表
-        List<MsgShopConfig> list = shopConfigService.lambdaQuery().eq(MsgShopConfig::getShopId, id).list();
+        List<MsgShopConfig> list = shopConfigService.lambdaQuery().eq(MsgShopConfig::getShopId, id)
+                .eq(MsgShopConfig::getIsDelete, "Y")
+                .list();
         //根据配置循环得出出技师列表带分页
         List<MsgTechnician> shop = new ArrayList<>();
         for (MsgShopConfig msgShopConfig : list) {
             MsgTechnician byId1 = msgTechnicianService.getById(msgShopConfig.getTenId());
-            shop.add(byId1);
+            if(StringUtils.isNotBlank(pageBean.getCounty())){
+                if(pageBean.getCounty().equals(byId1.getMsgCityId())){
+                    shop.add(byId1);
+                }
+
+            }else{
+                shop.add(byId1);
+            }
+
         }
         map.put("tenPageList",shop);
         return Result.ok(map);
@@ -238,10 +251,43 @@ public class UserVipApiServiceImpl implements UserVipApiService {
         }
         MsgTechnician byId = msgTechnicianService.getById(id);
         //查询项目列表数据
-        List<MsgShop> list = msgShopService.list();
+//        List<MsgShop> list = msgShopService.lambdaQuery()
+//                .list();
+        MsgTechnician technician = msgTechnicianService.lambdaQuery()
+                .eq(MsgTechnician::getUserId, hanHaiMember.getId())
+                .one();
+        //技师不能为空
+        if(technician==null){
+            return Result.error("技师不存在");
+        }
+        List<MsgShopConfig> list = msgShopConfigService.lambdaQuery()
+                .eq(MsgShopConfig::getTenId, technician.getId())
+                .eq(MsgShopConfig::getIsDelete, "Y")
+                .list();
+        List<MsgShop> listShop = new ArrayList<>();
+//        if(list.size()==1){
+//            MsgShop msgShop = msgShopService.getById(list.get(0).getShopId());
+//            listShop.add(msgShop);
+//        }else{
+            for (MsgShopConfig s:list) {
+                MsgShopConfig msgShopConfig = s;
+                msgShopConfig.setShopObject(msgShopService.getById(s.getShopId()));
+
+
+                MsgShop msgShop = msgShopService.getById(s.getShopId());
+                listShop.add(msgShop);
+            }
+//        }
+
+
+
+
+
+
+
         Map map = new HashMap();
         map.put("msgTechnician", byId);
-        map.put("list",list);
+        map.put("list",listShop);
 
         //查询是否已收藏技师
         MsgCollect one = msgCollectService.lambdaQuery().eq(MsgCollect::getTenId, byId.getId()).eq(MsgCollect::getUserId, hanHaiMember.getId()).one();

shop/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=https://admin.tiandufuwu.com/massage-api-tiandu/
+VUE_APP_API_BASE_URL=http://localhost:8001/massage-api-tiandu/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

shop/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=https://admin.tiandufuwu.com/massage-api-tiandu/
+VUE_APP_API_BASE_URL=http://localhost:8001/massage-api-tiandu/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview