主订单的一些修改更新

leromro-core/src/main/java/com/leromro/core/domain/MainOrders.java

@@ -35,6 +35,7 @@ public class MainOrders extends BaseEntity
     /** 订单id */
     @ApiModelProperty("订单id")
     @TableField("main_order_id")
+    @TableId
     private String mainOrderId;
 
     /** 下单用户id */
@@ -56,7 +57,12 @@ public class MainOrders extends BaseEntity
     /**  0待支付 1已支付 2支付超时或取消 3进行中 4已完成 5申请退款中 6已退款 7部分退款 8 待确认  */
     @Excel(name = " 0待支付 1已支付 2支付超时或取消 3进行中 4已完成 5申请退款中 6已退款 7部分退款 8 待评价 ")
     @ApiModelProperty(" 0待支付 1已支付 2支付超时或取消 3进行中 4已完成 5申请退款中 6已退款 7部分退款 8 待评价 ")
-    private Integer orderStatus;
+    private String orderStatus;
+
+    /** 服务大类别 */
+    @Excel(name = "服务总评分")
+    @ApiModelProperty("服务总评分")
+    private Long score;
 
     /** 服务大类别 */
     @Excel(name = "服务大类别")
@@ -113,12 +119,9 @@ public class MainOrders extends BaseEntity
     /** 订单支付方式：0余额 ，1微信，2支付宝 */
     @Excel(name = "订单支付方式：0 未支付，1余额 ，2微信，3支付宝")
     @ApiModelProperty("订单支付方式：0 未支付，1余额 ，2微信，3支付宝")
-    private Integer paymentMethod;
+    private String paymentMethod;
+
 
-    /** 志愿者id */
-    @Excel(name = "外部支付单号")
-    @ApiModelProperty("外部支付单号")
-    private Long transactionId;
 
     /** 志愿者id */
     @Excel(name = "志愿者id")
@@ -130,6 +133,21 @@ public class MainOrders extends BaseEntity
     @ApiModelProperty("受服务地址id")
     private Long addressId;
 
+    /** 受服务地址id */
+    @Excel(name = "受服务地址")
+    @ApiModelProperty("受服务地址")
+    private String address;
+
+    /** 受服务地址id */
+    @Excel(name = "受服务地址人姓名")
+    @ApiModelProperty("受服务地址人姓名")
+    private String clientName;
+
+    /** 受服务地址id */
+    @Excel(name = "受服务地址手机号")
+    @ApiModelProperty("受服务地址手机号")
+    private String clientTelephone;
+
     /** 是否删除 0未删除，1已删除 */
     @Excel(name = "是否删除 0未删除，1已删除")
     @ApiModelProperty("是否删除 0未删除，1已删除")

leromro-core/src/main/java/com/leromro/core/domain/vo/MainOrdersVO.java

@@ -11,6 +11,8 @@ public class MainOrdersVO extends MainOrders {
     private String name;
     private String skillDescribe;
 
+    private String volunteerPicture;
+
     @ApiModelProperty("业务层级名称")
     private String businessTierName;
 }

leromro-core/src/main/java/com/leromro/core/mapper/MainOrdersMapper.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 
 public interface MainOrdersMapper extends BaseMapper<MainOrders> {
-     int insertMainOrders(MainOrders mainOrders);
+     // int insertMainOrders(MainOrders mainOrders);
 
      List<MainOrdersVO> selectByUserId(@Param("orderStatus") Integer orderStatus, @Param("userId") Long userId);
 

leromro-core/src/main/java/com/leromro/core/service/impl/MainOrderServiceImpl.java

@@ -40,6 +40,8 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
     private Snowflake snowflake;
     @Autowired
     private PlatformFinanceMapper platformFinanceMapper;
+    @Autowired
+    private AddressMapper addressMapper;
 
     /**
      * @param userId
@@ -63,6 +65,11 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
         MainOrders orders = orderRequest.getOrders();
         List<VolunteerWorkDate> workDateList = orderRequest.getWorkDateList();
         Long userId = SecurityUtils.getUserId();
+        //把地址信息也添加到数据里面
+        Address address = addressMapper.selectAddressByAddressId(orders.getAddressId());
+        orders.setAddress(address.getAddress());
+        orders.setClientName(address.getName());
+        orders.setClientTelephone(address.getTelephone());
         //获取志愿者信息，同时服务时长和价格也都在志愿者id中进行获取
         VolunteerInfo info = volunteerInfoMapper.selectOne(new LambdaQueryWrapper<VolunteerInfo>()
                 .eq(VolunteerInfo::getVolunteerInfoId, orders.getVolunteerInfoId()));
@@ -84,9 +91,9 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
         //创建订单主表
         long orderId = snowflake.nextId();
         orders.setMainOrderId(String.valueOf(orderId));
-        orders.setOrderStatus(1);
+        orders.setOrderStatus("1");
         orders.setFinishTimes(0L);
-        orders.setPaymentMethod(0);
+        orders.setPaymentMethod("0");
         orders.setUserId(userId);
         orders.setCreateTime(DateTimeUtil.getNowTime());
         orders.setServiceOnePrice(serviceOnePrice);
@@ -104,7 +111,7 @@ public class MainOrderServiceImpl extends ServiceImpl<MainOrdersMapper, MainOrde
         SecondOrder secondOrder = SecondOrder.builder().mainOrderId(String.valueOf(orderId)).volunteerId(orders.getVolunteerId()).
                 serviceCategory(orders.getServiceCategory()).serviceSubject(orders.getServiceSubject()).serviceType(orders.getServiceType())
                 .serviceDuration(orders.getServiceDuration()).addressId(orders.getAddressId()).serviceOnePrice(orders.getServiceOnePrice())
-                .orderStatus(0).serviceType(orders.getServiceType()).serviceSubject(orders.getServiceSubject()).build();
+                .orderStatus("0").serviceType(orders.getServiceType()).serviceSubject(orders.getServiceSubject()).build();
         secondOrder.setRemark(orders.getRemark());
         List<SecondOrder> secondOrderList = new ArrayList<>();
         //添加平台

leromro-core/src/main/resources/mapper/core/MainOrdersMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where order_id = #{orderId}
     </select>-->
 
-    <insert id="insertMainOrders" parameterType="MainOrders">
+    <!--<insert id="insertMainOrders" parameterType="MainOrders">
         insert into l_main_orders
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="mainOrderId != null">main_order_id,</if>
@@ -118,13 +118,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="isDelete != null">#{isDelete},</if>
          </trim>
-    </insert>
+    </insert>-->
     <update id="startService" parameterType="java.lang.String">
         update l_main_orders set order_status = 3 where main_order_id = (select main_order_id from l_second_order where second_order_id = #{secondOrderId});
     </update>
     <select id="selectByUserId" resultType="com.leromro.core.domain.vo.MainOrdersVO">
         select
-        lmo.*,lvi.name ,lvi.skill_describe,lvi.business_tier_name from  l_main_orders lmo left join l_volunteer_info lvi on lmo.volunteer_id = lvi.volunteer_id
+        lmo.*,lvi.name ,lvi.volunteer_picture as volunteerPicture,lvi.skill_describe,lvi.business_tier_name from  l_main_orders lmo left join l_volunteer_info lvi on lmo.volunteer_id = lvi.volunteer_id
         <where>
             <if test="orderStatus != null and orderStatus != ''">
                 and order_status = #{orderStatus}