fllmoyu 4 rokov pred
rodič
commit
f4bbe28442

+ 4 - 0
common/src/main/java/com/jpsoft/bus/modules/base/entity/OrderInfo.java

@@ -59,4 +59,8 @@ public class OrderInfo {
     private Boolean delFlag;
     @ApiModelProperty(value = "乘客记录表")
     private String passengerId;
+    @ApiModelProperty(value = "购票类型,1:儿童票,2:成人票")
+    private String ticketType;
+    @ApiModelProperty(value = "货票金额")
+    private BigDecimal goodsTicket = BigDecimal.ZERO;
 }

+ 11 - 1
common/src/main/resources/mapper/base/OrderInfo.xml

@@ -22,6 +22,8 @@
 			<result property="updateTime" column="update_time" />
 			<result property="delFlag" column="del_flag" />
 			<result property="passengerId" column="passenger_id"/>
+			<result property="ticketType" column="ticket_type"/>
+			<result property="goodsTicket" column="goods_ticket"/>
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.bus.modules.base.entity.OrderInfo">
 	<!--
@@ -31,7 +33,7 @@
 	-->
 	<![CDATA[
 		insert into base_order_info
-	    (id_,total_fee,body_,pay_status,pay_name,pay_fee,refund_fee,pay_time,out_order_no,transaction_id,open_id,payment_id,create_by,create_time,update_by,update_time,del_flag,passenger_id)
+	    (id_,total_fee,body_,pay_status,pay_name,pay_fee,refund_fee,pay_time,out_order_no,transaction_id,open_id,payment_id,create_by,create_time,update_by,update_time,del_flag,passenger_id,ticket_type,goods_ticket)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -52,6 +54,8 @@
 ,#{updateTime,jdbcType= TIMESTAMP }
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{passengerId,jdbcType=VARCHAR}
+,#{ticketType,jdbcType=VARCHAR}
+,#{goodsTicket,jdbcType=DECIMAL}
 		)
 	]]>
 	</insert>
@@ -112,6 +116,12 @@
 			<if test="passengerId!=null">
 				passenger_id = #{passengerId,jdbcType=VARCHAR},
 			</if>
+			<if test="ticketType!=null">
+				ticket_type = #{ticketType,jdbcType=VARCHAR},
+			</if>
+			<if test="goodsTicket != null">
+				goods_ticket = #{goodsTicket,jdbcType=DECIMAL}
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

+ 31 - 0
web/src/main/java/com/jpsoft/bus/modules/driver/controller/DriverApiController.java

@@ -464,4 +464,35 @@ public class DriverApiController {
 
         return messageResult;
     }
+
+
+    @PostMapping("passengerInfo")
+    @ApiOperation(value = "乘客信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "令牌", paramType = "form"),
+            @ApiImplicitParam(name = "subject", value = "目标(不传)", paramType = "form"),
+            @ApiImplicitParam(name = "id", value = "乘客主id", required = true, paramType = "form")
+    })
+    public MessageResult<Map> passengerInfo(String id,String token, @RequestAttribute String subject) {
+        MessageResult<Map> messageResult = new MessageResult<>();
+
+        try {
+
+            VehicleInfo vehicleInfo = vehicleInfoService.get(subject);
+            if (vehicleInfo == null){
+                throw new Exception("当前车辆不存在");
+            }
+
+
+
+            messageResult.setResult(true);
+            messageResult.setCode(200);
+        } catch (Exception ex) {
+            messageResult.setResult(false);
+            messageResult.setMessage(ex.getMessage());
+        }
+
+        return messageResult;
+    }
+
 }