回退版本提交

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -26,7 +26,6 @@ import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.util.WeightUtils;
-import com.google.common.collect.Lists;
 import ma.glasnost.orika.MapperFacade;
 import ma.glasnost.orika.impl.DefaultMapperFactory;
 import org.apache.commons.collections4.CollectionUtils;
@@ -3031,4 +3030,55 @@ public class OrderSdkAdapter {
         }
         return name;
     }
+
+    /**
+     *  获取订单信息
+     * @param orderStatus
+     * @return
+     */
+    public String getOrderStatusValue(Integer orderStatus) {
+        String name = "";
+        switch (orderStatus) {
+            case 1: {
+                name = "待审核";
+                break;
+            }
+            case 6: {
+                name="审核通过";
+                break;
+            }
+            case 7: {
+                name ="审核未通过";
+                break;
+            }
+        }
+        return name;
+    }
+
+    /**
+     *  获取订单信息
+     * @param sourceList
+     * @return
+     */
+    public List<Integer> getBizTypes(List<String> sourceList) {
+        List<Integer> bizTypes = new ArrayList<>(0);
+        String source = sourceList.get(0);
+        switch (source) {
+            case "97": {
+                bizTypes.add(97);
+                break;
+            }
+            case "98": {
+                bizTypes.add(98);
+                break;
+            }
+            default:
+                bizTypes.add(1);
+                bizTypes.add(6);
+                bizTypes.add(97);
+                bizTypes.add(98);
+                break;
+        }
+        return bizTypes;
+    }
 }

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -258,4 +258,19 @@ public class OrderController {
         return orderAdapterService.createPrepay(request);
     }
 
+    @ApiOperation(value = "创建积分订单", notes = "创建积分订单", produces = "application/json")
+    @ApiAnnotation(logMessage = "createIntegralOrder")
+    @PostMapping("/createIntegralOrder")
+    public BaseResponse createIntegralOrder(@Validated @LogParams @RequestBody IntegralOrderVo request) {
+        return orderservice.createIntegralOrder(request);
+    }
+
+    /**
+     * 查询用户积分订单列表
+     */
+    @ApiAnnotation(logMessage = "queryOrderByConditions")
+    @PostMapping("/queryOrderByConditions")
+    public BaseResponse queryOrderByConditions(@Validated @LogParams @RequestBody QueryOrderByConditionsRequestVo queryOrderByConditionsRequestVo) {
+        return orderservice.queryOrderByConditions(queryOrderByConditionsRequestVo);
+    }
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -77,8 +77,16 @@ import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
+import com.freemud.application.sdk.api.ordercenter.request.OrderConditionsReq;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
+import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
+import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
+import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
+import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
+import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest;
 import com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResponse;
@@ -98,11 +106,13 @@ import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
 import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
 import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
 import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService;
+import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
 import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
+import com.freemud.sdk.api.assortment.order.util.LockUtils;
 import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
 import com.freemud.sdk.api.assortment.orderdistributor.entity.dto.PaymentMqMessageDto;
 import com.freemud.sdk.api.assortment.orderdistributor.service.PaymentQueueService;
@@ -114,15 +124,24 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfigureOrder;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.util.StringUtil;
 
+import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -224,6 +243,12 @@ public class OrderServiceImpl implements Orderservice {
     private OrderAdapterService orderAdapterService;
     @Autowired
     private AssortmentOpenPlatformPartnerManager assortmentOpenPlatformPartnerManager;
+    @Autowired
+    private OrderSdkService orderSdkService;
+    @Autowired
+    private OrderDownLoadSdkService orderDownLoadSdkService;
+    @Autowired
+    private OrderSdkAdapter orderSdkAdapter;
 
     @Override
     public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -5,7 +5,6 @@ import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
 import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant;
 import com.freemud.application.sdk.api.ordercenter.enums.ResponseResultEnum;
 import com.freemud.application.sdk.api.ordercenter.request.*;
-import com.freemud.application.sdk.api.ordercenter.request.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderAffirmReq;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCancelReq;
 import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderCreateReq;
@@ -13,6 +12,7 @@ import com.freemud.application.sdk.api.ordercenter.request.create.BatchQueryByCo
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateFatherSonOrderReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
 import com.freemud.application.sdk.api.ordercenter.response.*;
+import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
@@ -29,6 +29,8 @@ import org.springframework.web.client.RestTemplate;
 import java.util.List;
 import java.util.Objects;
 
+import static com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant.*;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *