update申请开票

jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java

@@ -12,6 +12,7 @@ import com.jsowell.common.response.RestApiResponse;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.dto.ApplyOrderInvoiceDTO;
 import com.jsowell.pile.dto.GenerateOrderDTO;
+import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
 import com.jsowell.pile.dto.QueryOrderDTO;
 import com.jsowell.pile.dto.SettleOrderDTO;
 import com.jsowell.pile.dto.StopChargingDTO;
@@ -19,7 +20,6 @@ import com.jsowell.pile.dto.UniAppQueryOrderDTO;
 import com.jsowell.pile.vo.uniapp.OrderVO;
 import com.jsowell.pile.vo.uniapp.UniAppOrderVO;
 import com.jsowell.service.OrderService;
-import com.jsowell.service.PileRemoteService;
 import com.jsowell.wxpay.dto.WechatSendMsgDTO;
 import com.jsowell.wxpay.service.WxAppletRemoteService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,9 +44,6 @@ public class OrderController extends BaseController {
 	@Autowired
 	private OrderService orderService;
 
-	@Autowired
-	private PileRemoteService pileRemoteService;
-
 	@Autowired
 	private WxAppletRemoteService wxAppletRemoteService;
 
@@ -296,4 +293,31 @@ public class OrderController extends BaseController {
 		}
 		return response;
 	}
+
+	/**
+	 * 查询会员申请开票记录
+	 * http://localhost:8080/uniapp/order/queryInvoiceRecord
+	 * @param request
+	 * @return
+	 */
+	@PostMapping("/queryInvoiceRecord")
+	public RestApiResponse<?> queryInvoiceRecord(HttpServletRequest request, @RequestBody QueryInvoiceRecordDTO dto) {
+		RestApiResponse<?> response;
+		try {
+			String memberId = getMemberIdByAuthorization(request);
+			if (StringUtils.isBlank(memberId)) {
+				throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
+			}
+			dto.setMemberId(memberId);
+			PageResponse pageResponse = orderService.queryInvoiceRecord(dto);
+			response = new RestApiResponse<>(pageResponse);
+		} catch (BusinessException e) {
+			logger.error("查询会员申请开票记录 warn", e);
+			response = new RestApiResponse<>(e.getCode(), e.getMessage());
+		} catch (Exception e){
+			logger.error("查询会员申请开票记录 error", e);
+			response = new RestApiResponse<>("00300003", "查询会员申请开票记录异常");
+		}
+		return response;
+	}
 }

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -61,6 +61,7 @@ import com.jsowell.pile.service.WxpayCallbackRecordService;
 import com.jsowell.pile.transaction.dto.OrderTransactionDTO;
 import com.jsowell.pile.transaction.service.TransactionService;
 import com.jsowell.pile.vo.base.PileInfoVO;
+import com.jsowell.pile.vo.uniapp.InvoiceRecordVO;
 import com.jsowell.pile.vo.uniapp.MemberVO;
 import com.jsowell.pile.vo.uniapp.OrderVO;
 import com.jsowell.pile.vo.uniapp.PayModeVO;
@@ -1074,4 +1075,31 @@ public class OrderService {
 		orderInvoiceRecord.setTotalServiceAmount(totalServiceAmount);
 		orderInvoiceRecordService.insertOrderInvoiceRecord(orderInvoiceRecord);
 	}
+
+	public PageResponse queryInvoiceRecord(QueryInvoiceRecordDTO dto) {
+
+		QueryInvoiceRecordDTO build = QueryInvoiceRecordDTO.builder()
+				.memberId(dto.getMemberId())
+				.build();
+		int pageNo = dto.getPageNo() == null ? 1 : dto.getPageNo();
+		int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
+		PageHelper.startPage(pageNo, pageSize);
+		List<OrderInvoiceRecord> orderInvoiceRecords = orderInvoiceRecordService.selectInvoiceRecordList(build);
+		PageInfo<OrderInvoiceRecord> pageInfo = new PageInfo<>(orderInvoiceRecords);
+		List<InvoiceRecordVO> volist = Lists.newArrayList();
+		for (OrderInvoiceRecord orderInvoiceRecord : orderInvoiceRecords) {
+			volist.add(
+					InvoiceRecordVO.builder()
+
+							.build()
+			);
+		}
+		return PageResponse.builder()
+				.total(pageInfo.getTotal())
+				.pages(pageInfo.getPages())
+				.pageNum(pageInfo.getPageNum())
+				.pageSize(pageInfo.getPageSize())
+				.list(volist)
+				.build();
+	}
 }

jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryInvoiceRecordDTO.java

@@ -17,4 +17,8 @@ public class QueryInvoiceRecordDTO {
 	private LocalDateTime startTime;
 
 	private LocalDateTime endTime;
+
+	private Integer pageNo;
+
+	private Integer pageSize;
 }

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

@@ -1,6 +1,5 @@
 package com.jsowell.pile.service.impl;
 
-import com.jsowell.common.util.DateUtils;
 import com.jsowell.pile.domain.OrderInvoiceRecord;
 import com.jsowell.pile.dto.QueryInvoiceRecordDTO;
 import com.jsowell.pile.mapper.OrderInvoiceRecordMapper;
@@ -67,7 +66,6 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService
 	 */
 	@Override
 	public int updateOrderInvoiceRecord(OrderInvoiceRecord orderInvoiceRecord) {
-		orderInvoiceRecord.setUpdateTime(DateUtils.getNowDate());
 		return orderInvoiceRecordMapper.updateOrderInvoiceRecord(orderInvoiceRecord);
 	}
 

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

@@ -0,0 +1,13 @@
+package com.jsowell.pile.vo.uniapp;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class InvoiceRecordVO {
+}