1、接口实现调整

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/controller/TravelOrderController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/entity/TravelOrder.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 预约订单表
  * @Author: jeecg-boot
- * @Date:   2024-09-27
+ * @Date:   2024-10-07
  * @Version: V1.0
  */
 @Data
@@ -55,9 +55,13 @@ public class TravelOrder implements Serializable {
 	@Excel(name = "主题", width = 15)
     @ApiModelProperty(value = "主题")
     private java.lang.String orderTitle;
-	/**电话*/
-	@Excel(name = "电话", width = 15)
-    @ApiModelProperty(value = "电话")
+	/**游客姓名*/
+	@Excel(name = "游客姓名", width = 15)
+    @ApiModelProperty(value = "游客姓名")
+    private java.lang.String orderName;
+	/**游客电话*/
+	@Excel(name = "游客电话", width = 15)
+    @ApiModelProperty(value = "游客电话")
     private java.lang.String orderPhone;
 	/**预约日期*/
 	@Excel(name = "预约日期", width = 15, format = "yyyy-MM-dd")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/mapper/TravelOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 预约订单表
  * @Author: jeecg-boot
- * @Date:   2024-09-27
+ * @Date:   2024-10-07
  * @Version: V1.0
  */
 public interface TravelOrderMapper extends BaseMapper<TravelOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/ITravelOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 预约订单表
  * @Author: jeecg-boot
- * @Date:   2024-09-27
+ * @Date:   2024-10-07
  * @Version: V1.0
  */
 public interface ITravelOrderService extends IService<TravelOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/impl/TravelOrderServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 预约订单表
  * @Author: jeecg-boot
- * @Date:   2024-09-27
+ * @Date:   2024-10-07
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/TravelOrderList.vue

@@ -133,7 +133,12 @@
             dataIndex: 'orderTitle'
           },
           {
-            title:'电话',
+            title:'游客姓名',
+            align:"center",
+            dataIndex: 'orderName'
+          },
+          {
+            title:'游客电话',
             align:"center",
             dataIndex: 'orderPhone'
           },
@@ -206,7 +211,8 @@
         let fieldList=[];
         fieldList.push({type:'int',value:'orderType',text:'订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-我要研学)',dictCode:''})
         fieldList.push({type:'string',value:'orderTitle',text:'主题',dictCode:''})
-        fieldList.push({type:'string',value:'orderPhone',text:'电话',dictCode:''})
+        fieldList.push({type:'string',value:'orderName',text:'游客姓名',dictCode:''})
+        fieldList.push({type:'string',value:'orderPhone',text:'游客电话',dictCode:''})
         fieldList.push({type:'date',value:'orderDate',text:'预约日期'})
         fieldList.push({type:'string',value:'orderTime',text:'预约时间',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'orderPrice',text:'预约价格',dictCode:''})

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/modules/TravelOrderForm.vue

@@ -14,8 +14,13 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderPhone">
-              <a-input v-model="model.orderPhone" placeholder="请输入电话"  ></a-input>
+            <a-form-model-item label="游客姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderName">
+              <a-input v-model="model.orderName" placeholder="请输入游客姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="游客电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderPhone">
+              <a-input v-model="model.orderPhone" placeholder="请输入游客电话"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue3/TravelOrder.data.ts

@@ -15,7 +15,12 @@ export const columns: BasicColumn[] = [
     dataIndex: 'orderTitle'
    },
    {
-    title: '电话',
+    title: '游客姓名',
+    align:"center",
+    dataIndex: 'orderName'
+   },
+   {
+    title: '游客电话',
     align:"center",
     dataIndex: 'orderPhone'
    },
@@ -69,7 +74,12 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '电话',
+    label: '游客姓名',
+    field: 'orderName',
+    component: 'Input',
+  },
+  {
+    label: '游客电话',
     field: 'orderPhone',
     component: 'Input',
   },

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWaresOrder/controller/TravelWaresOrderController.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWaresOrder/entity/TravelWaresOrder.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 商品订单表
  * @Author: jeecg-boot
- * @Date:   2024-10-06
+ * @Date:   2024-10-07
  * @Version: V1.0
  */
 @Data
@@ -68,7 +68,7 @@ public class TravelWaresOrder implements Serializable {
 	/**产品总价格*/
 	@Excel(name = "产品总价格", width = 15)
     @ApiModelProperty(value = "产品总价格")
-    private java.lang.Double price;
+    private java.math.BigDecimal price;
 	/**关联用户*/
 	@Excel(name = "关联用户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
@@ -78,4 +78,16 @@ public class TravelWaresOrder implements Serializable {
 	@Excel(name = "订单状态(0-待支付 1-已支付 2-已完成)", width = 15)
     @ApiModelProperty(value = "订单状态(0-待支付 1-已支付 2-已完成)")
     private java.lang.Integer status;
+	/**收件人姓名*/
+	@Excel(name = "收件人姓名", width = 15)
+    @ApiModelProperty(value = "收件人姓名")
+    private java.lang.String userName;
+	/**收件人电话*/
+	@Excel(name = "收件人电话", width = 15)
+    @ApiModelProperty(value = "收件人电话")
+    private java.lang.String userPhone;
+	/**收件人地址*/
+	@Excel(name = "收件人地址", width = 15)
+    @ApiModelProperty(value = "收件人地址")
+    private java.lang.String userAddress;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWaresOrder/mapper/TravelWaresOrderMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 商品订单表
  * @Author: jeecg-boot
- * @Date:   2024-10-06
+ * @Date:   2024-10-07
  * @Version: V1.0
  */
 public interface TravelWaresOrderMapper extends BaseMapper<TravelWaresOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWaresOrder/service/ITravelWaresOrderService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 商品订单表
  * @Author: jeecg-boot
- * @Date:   2024-10-06
+ * @Date:   2024-10-07
  * @Version: V1.0
  */
 public interface ITravelWaresOrderService extends IService<TravelWaresOrder> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWaresOrder/service/impl/TravelWaresOrderServiceImpl.java

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

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWaresOrder/vue/TravelWaresOrderList.vue

@@ -158,6 +158,21 @@
             align:"center",
             dataIndex: 'status'
           },
+          {
+            title:'收件人姓名',
+            align:"center",
+            dataIndex: 'userName'
+          },
+          {
+            title:'收件人电话',
+            align:"center",
+            dataIndex: 'userPhone'
+          },
+          {
+            title:'收件人地址',
+            align:"center",
+            dataIndex: 'userAddress'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -196,9 +211,12 @@
         fieldList.push({type:'string',value:'addressId',text:'关联收件人地址id',dictCode:"travel_address,address,id"})
         fieldList.push({type:'string',value:'statement',text:'下单须知',dictCode:''})
         fieldList.push({type:'int',value:'number',text:'产品数量',dictCode:''})
-        fieldList.push({type:'double',value:'price',text:'产品总价格',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'产品总价格',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'关联用户',dictCode:"han_hai_member,nick_name,id"})
         fieldList.push({type:'int',value:'status',text:'订单状态(0-待支付 1-已支付 2-已完成)',dictCode:''})
+        fieldList.push({type:'string',value:'userName',text:'收件人姓名',dictCode:''})
+        fieldList.push({type:'string',value:'userPhone',text:'收件人电话',dictCode:''})
+        fieldList.push({type:'string',value:'userAddress',text:'收件人地址',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWaresOrder/vue/modules/TravelWaresOrderForm.vue

@@ -38,6 +38,21 @@
               <a-input-number v-model="model.status" placeholder="请输入订单状态(0-待支付 1-已支付 2-已完成)" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收件人姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userName">
+              <a-input v-model="model.userName" placeholder="请输入收件人姓名"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收件人电话" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userPhone">
+              <a-input v-model="model.userPhone" placeholder="请输入收件人电话"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="收件人地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userAddress">
+              <a-input v-model="model.userAddress" placeholder="请输入收件人地址"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWaresOrder/vue3/TravelWaresOrder.data.ts

@@ -40,6 +40,21 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'status'
    },
+   {
+    title: '收件人姓名',
+    align:"center",
+    dataIndex: 'userName'
+   },
+   {
+    title: '收件人电话',
+    align:"center",
+    dataIndex: 'userPhone'
+   },
+   {
+    title: '收件人地址',
+    align:"center",
+    dataIndex: 'userAddress'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -90,4 +105,19 @@ export const formSchema: FormSchema[] = [
     field: 'status',
     component: 'InputNumber',
   },
+  {
+    label: '收件人姓名',
+    field: 'userName',
+    component: 'Input',
+  },
+  {
+    label: '收件人电话',
+    field: 'userPhone',
+    component: 'Input',
+  },
+  {
+    label: '收件人地址',
+    field: 'userAddress',
+    component: 'Input',
+  },
 ];

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java

@@ -9,6 +9,7 @@ import org.jeecg.modules.apiService.IndexApiService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.travelAddress.entity.TravelAddress;
 import org.jeecg.modules.travelCollection.entity.TravelCollection;
+import org.jeecg.modules.travelOrder.entity.TravelOrder;
 import org.jeecg.modules.travelShopcar.entity.TravelShopcar;
 import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer;
 import org.jeecg.modules.travelWaresOrder.entity.TravelWaresOrder;
@@ -87,9 +88,9 @@ public class UserInfoApiController {
 
     //创建预约订单
     @ApiOperation(value = "我的预约-创建预约订单",notes = "我的预约-创建预约订单")
-    @PostMapping("/createOrder")
-    public Result<?> addOrder(@RequestHeader("X-Access-Token") String token, TravelWaresOrder travelWaresOrder){
-        return indexApiService.addWaresOrder(token, travelWaresOrder);
+    @PostMapping("/addOrder")
+    public Result<?> addOrder(@RequestHeader("X-Access-Token") String token, TravelOrder travelOrder){
+        return indexApiService.addOrder(token, travelOrder);
     }
 
     /*******************我的地址****************************/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/WaresOrderApiBean.java

@@ -9,7 +9,6 @@ import org.jeecg.modules.travelWaresOrder.entity.TravelWaresOrder;
 public class WaresOrderApiBean {
 
     TravelWares travelWares;
-    TravelAddress travelAddress;
     TravelWaresOrder travelWaresOrder;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java

@@ -96,6 +96,9 @@ public interface IndexApiService {
     //查询预约订单列表
     public Result<?> queryOrderList(String token, String orderType, PageBean pageBean);
 
+    //创建预约订单
+    Result<?> addOrder(String token, TravelOrder travelOrder);
+
     //查询文创好物订单列表
     public Result<?> queryWaresOrderList(String token, PageBean pageBean);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/OrderApiService.java

@@ -4,8 +4,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.travelOrder.entity.TravelOrder;
 
 public interface OrderApiService {
-    //创建订单
-    Result<?> addOrder(TravelOrder travelOrder);
+
 
     //立即支付
     Result<?> payOrder();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java

@@ -51,6 +51,7 @@ import org.jeecg.modules.travelWaresOrder.service.ITravelWaresOrderService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -703,11 +704,12 @@ public class IndexApiServiceImpl implements IndexApiService {
     public Result<?> addAddress(String token, TravelAddress travelAddress) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-        //查询地址是否已经存在
-        TravelAddress one = travelAddressService.lambdaQuery().setEntity(travelAddress).one();
-        if(null != one){
+        /*//查询地址是否已经存在
+        travelAddress.setUserId(hanHaiMember.getId());
+        List<TravelAddress> addresses = travelAddressService.lambdaQuery().setEntity(travelAddress).list();
+        if(null != addresses){
             return Result.OK("该地址已存在！");
-        }
+        }*/
 
         if("1".equals(travelAddress.getAddressDefault())){
             //将原默认地址改为不默认
@@ -854,6 +856,32 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("预约订单列表", pageList);
     }
 
+    //创建预约订单
+    @Override
+    public Result<?> addOrder(String token, TravelOrder travelOrder) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        TravelOrder one = travelOrderService
+                .lambdaQuery()
+                .eq(TravelOrder::getUserId, hanHaiMember.getId())
+                .eq(TravelOrder::getItemId, travelOrder.getItemId())
+                .notIn(TravelOrder::getOrderStatus, 2)
+                .one();
+
+        if(null != one){
+            return Result.OK("你有未完成的预约！");
+        }
+
+        travelOrder.setUserId(hanHaiMember.getId());
+        travelOrder.setOrderStatus("0");
+        boolean flag = travelOrderService.save(travelOrder);
+        if(flag){
+            return Result.OK("创建订单成功！");
+        }else {
+            return Result.OK("创建订单失败！");
+        }
+    }
+
     //获取文创好物列表
     public Result<?> queryWaresList(PageBean pageBean) {
         Page<TravelWares> page = new Page<TravelWares>(pageBean.getPageNo(), pageBean.getPageSize());
@@ -882,13 +910,13 @@ public class IndexApiServiceImpl implements IndexApiService {
     //获取文创好物订单列表
     @Override
     public Result<?> queryWaresOrderList(String token, PageBean pageBean) {
-        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         List<WaresOrderApiBean> waresOrderApiBeans = new ArrayList<>();
 
         List<TravelWaresOrder> travelWaresOrders = travelWaresOrderService
                 .lambdaQuery()
-                .eq(TravelWaresOrder::getUserId, hanHaiMember.getId())
+                //.eq(TravelWaresOrder::getUserId, hanHaiMember.getId())
                 .list();
 
         for (TravelWaresOrder travelWaresOrder : travelWaresOrders) {
@@ -909,7 +937,7 @@ public class IndexApiServiceImpl implements IndexApiService {
 
             waresOrderApiBean.setTravelWaresOrder(travelWaresOrder);
             waresOrderApiBean.setTravelWares(wares);
-            waresOrderApiBean.setTravelAddress(address);
+
             waresOrderApiBeans.add(waresOrderApiBean);
 
         }
@@ -920,10 +948,38 @@ public class IndexApiServiceImpl implements IndexApiService {
     //创建文创好物订单
     @Override
     public Result<?> addWaresOrder(String token, TravelWaresOrder travelWaresOrder) {
-        //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        TravelAddress address = travelAddressService
+                .lambdaQuery()
+                .eq(TravelAddress::getId, travelWaresOrder.getAddressId())
+                .one();
+
+        TravelWares wares = travelWaresService
+                .lambdaQuery()
+                .eq(TravelWares::getId, travelWaresOrder.getWaresId())
+                .one();
 
-        travelWaresOrder.setUserId("1830937399972528130");
+        //商品单价
+        BigDecimal waresPrice = wares.getWaresPrice();
+        //商品数量
+        int waresNumber =  travelWaresOrder.getNumber();
+
+        //收件人姓名
+        String userName = address.getUserName();
+        //收件人电话号码
+        String userPhone = address.getUserPhone();
+        //收件人地址
+        String userAddress = address.getArea()+address.getAddress();
+        travelWaresOrder.setUserName(userName);
+        travelWaresOrder.setUserPhone(userPhone);
+        travelWaresOrder.setUserAddress(userAddress);
+
+        //进位处理 2.35变成2.4
+        BigDecimal price = waresPrice.multiply(new BigDecimal(waresNumber)).setScale(2,BigDecimal.ROUND_UP);
+        travelWaresOrder.setUserId(hanHaiMember.getId());
         travelWaresOrder.setStatus(0);
+        travelWaresOrder.setPrice(price);
 
         boolean flag = travelWaresOrderService.save(travelWaresOrder);
         if(flag){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderApiServiceImpl.java

@@ -22,17 +22,7 @@ public class OrderApiServiceImpl implements OrderApiService {
 
 
 
-    //创建订单
-    @Override
-    public Result<?> addOrder(TravelOrder travelOrder)
-    {
-        boolean flag = travelOrderService.save(travelOrder);
-        if(flag){
-            return Result.OK("创建订单成功！");
-        }else {
-            return Result.OK("创建订单失败！");
-        }
-    }
+
 
     //立即支付
     @Override