update 添加启用注解

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

@@ -86,9 +86,6 @@ public class OrderService {
     @Autowired
     private WechatPayService wechatPayService;
 
-	@Autowired
-	private WxpayCallbackRecordService wxpayCallbackRecordService;
-
     @Autowired
     private IMemberTransactionRecordService memberTransactionRecordService;
 
@@ -130,9 +127,11 @@ public class OrderService {
 
     /**
      * 生成订单
+     *
      * @param dto
      * @return
      */
+    @Deprecated
     public String generateOrder(GenerateOrderDTO dto) throws ParseException {
         OrderBasicInfo basicInfo = orderBasicInfoService.generateOrder(dto);
         if (basicInfo != null) {
@@ -143,6 +142,7 @@ public class OrderService {
 
     /**
      * 生成订单
+     *
      * @param dto
      * @return
      */
@@ -159,14 +159,17 @@ public class OrderService {
 
     /**
      * 订单支付
+     *
      * @param dto
      */
+    @Deprecated
     public Map<String, Object> payOrder(PayOrderDTO dto) throws Exception {
         return orderBasicInfoService.payOrder(dto);
     }
 
     /**
      * 订单支付
+     *
      * @param dto
      */
     public Map<String, Object> payOrderV2(PayOrderDTO dto) {
@@ -217,7 +220,7 @@ public class OrderService {
         } else if (StringUtils.equals("3", orderStatus)) {
             // 查已完成订单
             orderStatusList.add("6");
-		}else if (StringUtils.equals("4", orderStatus)) {
+        } else if (StringUtils.equals("4", orderStatus)) {
             // 查询正在进行中的订单
             orderStatusList.add("1");
         }
@@ -355,6 +358,7 @@ public class OrderService {
 
     /**
      * 微信退款
+     *
      * @param dto
      */
     public void weChatRefund(ApplyRefundDTO dto) {
@@ -364,9 +368,10 @@ public class OrderService {
 
     /**
      * 汇付退款
+     *
      * @param dto
      */
-	public void adapayRefund(ApplyRefundDTO dto){
+    public void adapayRefund(ApplyRefundDTO dto) {
         log.info("汇付退款 param:{}", JSON.toJSONString(dto));
         // 退款有两种情况 1-订单结算退款  2-用户余额退款
         String refundType = dto.getRefundType();
@@ -381,6 +386,7 @@ public class OrderService {
 
     /**
      * 查询订单详情信息
+     *
      * @param orderCode 订单编号
      * @return
      */
@@ -563,6 +569,7 @@ public class OrderService {
 
     /**
      * 微信支付退款回调
+     *
      * @param request
      * @param body
      * @throws Exception
@@ -574,6 +581,7 @@ public class OrderService {
 
     /**
      * 获取小程序订单详情
+     *
      * @param orderCode
      * @return
      */
@@ -672,6 +680,7 @@ public class OrderService {
 
     /**
      * 小程序订单详情V2
+     *
      * @param orderCode
      * @return
      */
@@ -679,12 +688,12 @@ public class OrderService {
         UniAppOrderDetailVO resultVO = new UniAppOrderDetailVO();
 
 
-
         return resultVO;
     }
 
     /**
      * 根据订单号查询充电桩启动状态
+     *
      * @param orderCode
      * @return
      */
@@ -700,6 +709,7 @@ public class OrderService {
 
     /**
      * 关闭支付未启动的订单
+     *
      * @param dto
      */
     public void closeStartFailedOrder(QueryOrderDTO dto) {
@@ -708,6 +718,7 @@ public class OrderService {
 
     /**
      * 人工结算订单
+     *
      * @param dto
      */
     public boolean manualSettlementOrder(ManualSettlementDTO dto) {
@@ -765,6 +776,7 @@ public class OrderService {
 
     /**
      * 当前登录会员 获取支付方式
+     *
      * @param dto
      */
     public List<PayModeVO> getPayMode(GetPayModeDTO dto) {
@@ -806,6 +818,7 @@ public class OrderService {
     /**
      * 查询未开发票订单
      * 时间限制15天内
+     *
      * @param dto
      * @return
      */
@@ -853,6 +866,7 @@ public class OrderService {
 
     /**
      * 申请开票
+     *
      * @param dto
      */
     public void applyOrderInvoice(ApplyOrderInvoiceDTO dto) {
@@ -928,6 +942,7 @@ public class OrderService {
 
     /**
      * 查询开票记录
+     *
      * @param dto
      * @return
      */
@@ -963,19 +978,20 @@ public class OrderService {
 
     /**
      * 汇付支付 支付回调
+     *
      * @param request
      * @throws Exception
      */
     public void adapayCallback(HttpServletRequest request) throws Exception {
-		//验签请参data
+        // 验签请参data
         String data = request.getParameter("data");
-		//验签请参sign
+        // 验签请参sign
         String sign = request.getParameter("sign");
 
-		//验签请参publicKey
+        // 验签请参publicKey
         String publicKey = AdapayCore.PUBLIC_KEY;
         log.info("汇付支付回调验签请参data={}, sign={}", data, sign);
-		//验签标记
+        // 验签标记
         boolean checkSign = AdapaySign.verifySign(data, sign, publicKey);
         if (!checkSign) {
             log.info("汇付支付回调验签失败:{}", data);
@@ -1018,11 +1034,12 @@ public class OrderService {
 
     /**
      * adapay支付成功回调
+     *
      * @param data
      * @throws JsonProcessingException
      */
     private void paymentSucceeded(String data) throws JsonProcessingException {
-		//验签成功 保存到回调记录表中
+        // 验签成功 保存到回调记录表中
         JSONObject jsonObject = JSON.parseObject(data);
         ObjectMapper mapper = new ObjectMapper();
         mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
@@ -1160,6 +1177,7 @@ public class OrderService {
 
     /**
      * 退款失败
+     *
      * @param data
      */
     private void refundFailed(String data) {
@@ -1224,6 +1242,7 @@ public class OrderService {
 
     /**
      * 取现失败
+     *
      * @param data
      */
     private void cashFailed(String data) {

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

@@ -7,6 +7,7 @@ import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.pile.domain.*;
 import com.jsowell.pile.dto.*;
+import com.jsowell.pile.service.orderlogic.AbstractOrderLogic;
 import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
 import com.jsowell.pile.vo.base.OrderAmountDetailVO;
 import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
@@ -110,7 +111,9 @@ public interface IOrderBasicInfoService {
 	 * 根据交易记录结算订单
 	 * @param data 交易记录数据
 	 * @param orderBasicInfo
+	 * @deprecated 该方法废弃 {@link AbstractOrderLogic#settleOrder(TransactionRecordsData, OrderBasicInfo)} instead.
 	 */
+	@Deprecated
 	void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo);
 
 	/**