update 查询申请开票详情新增 会员手机号码

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderInvoiceRecordMapper.java

@@ -23,7 +23,7 @@ public interface OrderInvoiceRecordMapper {
 	 * @param id 申请开票主键
 	 * @return 申请开票
 	 */
-	public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id);
+	public OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id);
 
 	/**
 	 * 查询申请开票列表

jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderInvoiceRecordService.java

@@ -22,7 +22,7 @@ public interface IOrderInvoiceRecordService {
 	 * @param id 申请开票主键
 	 * @return 申请开票
 	 */
-	OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id);
+	OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id);
 
 	InvoiceRecordVO selectInvoiceTitleVO(Integer id);
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java

@@ -47,32 +47,33 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService
 	 * @return 申请开票
 	 */
 	@Override
-	public OrderInvoiceRecord selectOrderInvoiceRecordById(Integer id) {
+	public OrderInvoiceRecordVO selectOrderInvoiceRecordById(Integer id) {
 		return orderInvoiceRecordMapper.selectOrderInvoiceRecordById(id);
 	}
 
 	@Override
 	public InvoiceRecordVO selectInvoiceTitleVO(Integer id) {
 		// 申请记录信息
-		OrderInvoiceRecord orderInvoiceRecord = selectOrderInvoiceRecordById(id);
-		if (orderInvoiceRecord == null) {
+		OrderInvoiceRecordVO vo = selectOrderInvoiceRecordById(id);
+		if (vo == null) {
 			return null;
 		}
 		// 发票抬头信息
-		InvoiceTitleVO invoiceTitleVO = memberInvoiceTitleService.selectByTitleId(orderInvoiceRecord.getTitleId());
+		InvoiceTitleVO invoiceTitleVO = memberInvoiceTitleService.selectByTitleId(vo.getTitleId());
 
 		// 订单信息
-		List<String> orderCodes = Lists.newArrayList(orderInvoiceRecord.getOrderCodes().split(","));
+		List<String> orderCodes = Lists.newArrayList(vo.getOrderCodes().split(","));
 		List<OrderAmountDetailVO> orderAmountDetailVOS = orderBasicInfoService.queryOrderAmountDetail(orderCodes);
 
 		return InvoiceRecordVO.builder()
-				.id(orderInvoiceRecord.getId() + "")
-				.memberId(orderInvoiceRecord.getMemberId())
-				.status(orderInvoiceRecord.getStatus())
+				.id(vo.getId() + "")
+				.memberId(vo.getMemberId())
+				.phoneNumber(vo.getPhoneNumber())
+				.status(vo.getStatus())
 				.invoiceTitle(invoiceTitleVO)
 				.orderList(orderAmountDetailVOS)
-				.createTime(DateUtils.formatDateTime(orderInvoiceRecord.getCreateTime()))
-				.updateTime(DateUtils.formatDateTime(orderInvoiceRecord.getUpdateTime()))
+				.createTime(vo.getCreateTime())
+				.updateTime(vo.getUpdateTime())
 				.build();
 	}
 

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java

@@ -24,6 +24,11 @@ public class InvoiceRecordVO {
 	 */
 	private String memberId;
 
+	/**
+	 * 会员手机号码
+	 */
+	private String phoneNumber;
+
 	/**
 	 * 状态 0-未开票 1-已开票
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderInvoiceRecordVO.java

@@ -29,4 +29,9 @@ public class OrderInvoiceRecordVO {
      * 运营商电话
      */
     private String merchantTel;
+
+    /**
+     * 会员手机号码
+     */
+    private String phoneNumber;
 }

jsowell-pile/src/main/resources/mapper/pile/OrderInvoiceRecordMapper.xml

@@ -49,10 +49,7 @@
         order by create_time desc
     </select>
 
-    <select id="selectOrderInvoiceRecordById" parameterType="Integer" resultMap="OrderInvoiceRecordResult">
-        <include refid="selectOrderInvoiceRecordVo"/>
-        where id = #{id}
-    </select>
+
 
     <insert id="insertOrderInvoiceRecord" parameterType="com.jsowell.pile.domain.OrderInvoiceRecord" useGeneratedKeys="true" keyProperty="id">
         insert into order_invoice_record
@@ -199,4 +196,24 @@
             </if>
         </where>
     </select>
+
+    <select id="selectOrderInvoiceRecordById" resultType="com.jsowell.pile.vo.web.OrderInvoiceRecordVO">
+        SELECT
+            t1.id,
+            t1.member_id as memberId,
+            t2.mobile_number AS phoneNumber,
+            t1.merchant_id AS merchantId,
+            t1.title_id AS titleId,
+            t1.order_codes AS orderCodes,
+            t1.STATUS,
+            t1.total_amount AS totalAmount,
+            t1.total_service_amount AS totalServiceAmount,
+            t1.total_elec_amount AS totalElecAmount,
+            t1.create_time AS createTime
+        FROM
+            order_invoice_record t1
+                JOIN member_basic_info t2 ON t1.member_id = t2.member_id
+                AND t1.del_flag = '0'
+        where t1.id = #{id,jdbcType=INTEGER}
+    </select>
 </mapper>