Merge branch 'master' of http://gitea.dctpay.com/hurui/youtao

cweb/src/main/java/com/hfkj/controller/GoodsController.java

@@ -10,6 +10,7 @@ import com.hfkj.common.utils.ResponseMsgUtil;
 import com.hfkj.entity.BsOrder;
 import com.hfkj.entity.BsUser;
 import com.hfkj.model.*;
+import com.hfkj.service.elm.ElmService;
 import com.hfkj.service.goods.GoodsDataService;
 import com.hfkj.service.order.BsOrderService;
 import com.hfkj.service.pdd.PddService;
@@ -205,9 +206,8 @@ public class GoodsController {
     public ResponseData getOrderList(@RequestParam(value = "code" , required = false) String code
     ) {
         try {
-            orderService.getOrderTaoBaoList("2024-11-04 09:34:00" , "2024-11-04 12:34:00" );
 
-            return ResponseMsgUtil.success("1");
+            return ResponseMsgUtil.success(ElmService.elmOrderList("2024-10-20 09:34:00" , "2024-11-04 12:34:00").getJSONArray("result"));
 
         } catch (Exception e) {
             log.error("error!",e);

cweb/src/main/java/com/hfkj/controller/order/BsOrderController.java

@@ -120,8 +120,9 @@ public class BsOrderController {
 
 
         List<BsOrder> list = orderService.getOrderList(new HashMap<>());
+
         // 查询个人订单
-        List<BsOrder> orderUserList = list.stream().filter(s->s.getUserId().equals(session.getUser().getId())).collect(Collectors.toList());
+        List<BsOrder> orderUserList = list.stream().filter(s-> s.getUserId() != null).filter(s->s.getUserId().equals(session.getUser().getId())).collect(Collectors.toList());
         //查询团队
         // 查询团队用户
         Map<String,Object> param = new HashMap<>();

schedule/pom.xml

@@ -20,6 +20,27 @@
             <artifactId>service</artifactId>
             <version>PACKT-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>taobao.skd</groupId>
+            <artifactId>taobao-open-sdk</artifactId>
+            <scope>system</scope>
+            <version>1.0.1</version>
+            <systemPath>${basedir}/lib/taobao-sdk.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>taobao-elm.skd</groupId>
+            <artifactId>taobao-open-elm-sdk</artifactId>
+            <scope>system</scope>
+            <version>1.0.1</version>
+            <systemPath>${basedir}/lib/taobao-sdk-java-elm.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>pop.skd</groupId>
+            <artifactId>pop-open-sdk</artifactId>
+            <scope>system</scope>
+            <version>1.0.1</version>
+            <systemPath>${basedir}/lib/pop-sdk-1.18.23-all.jar</systemPath>
+        </dependency>
     </dependencies>
 
     <build>
@@ -28,6 +49,13 @@
                 <directory>src/main/resources/${env}</directory>
                 <filtering>false</filtering>
             </resource>
+            <resource>
+                <directory>${basedir}/lib</directory>
+                <targetPath>BOOT-INF/lib/</targetPath>
+                <includes>
+                    <include>**/*.jar</include>
+                </includes>
+            </resource>
         </resources>
         <plugins>
             <plugin>

service/src/main/java/com/hfkj/service/elm/ElmService.java

@@ -7,8 +7,10 @@ import com.hfkj.service.taobao.TaoBaoService;
 import com.taobao.api.DefaultTaobaoClient;
 import com.taobao.api.TaobaoClient;
 import com.taobao.api.request.AlibabaAlscUnionElemePromotionOfficialactivityGetRequest;
+import com.taobao.api.request.AlibabaAlscUnionKbcpxPositiveOrderGetRequest;
 import com.taobao.api.request.AlibabaAlscUnionMediaZoneAddRequest;
 import com.taobao.api.response.AlibabaAlscUnionElemePromotionOfficialactivityGetResponse;
+import com.taobao.api.response.AlibabaAlscUnionKbcpxPositiveOrderGetResponse;
 import com.taobao.api.response.AlibabaAlscUnionMediaZoneAddResponse;
 
 import org.slf4j.Logger;
@@ -62,17 +64,23 @@ public class ElmService {
     }
 
 
-    public static JSONObject mediaZoneAdd(String sessionKey) throws Exception {
+    public static JSONObject elmOrderList(String startTime , String endTime) throws Exception {
 
         // 打印日志， 本地生活媒体推广位创建
         log.info("============  本地生活媒体推广位创建-START =============");
 
         // 创建淘宝客户端
         TaobaoClient client = new DefaultTaobaoClient(url, appKey, appsecret);
-        AlibabaAlscUnionMediaZoneAddRequest req = new AlibabaAlscUnionMediaZoneAddRequest();
-        req.setZoneName("推广位");
-        req.setMediaId("1");
-        AlibabaAlscUnionMediaZoneAddResponse rsp = client.execute(req, sessionKey);
+        AlibabaAlscUnionKbcpxPositiveOrderGetRequest req = new AlibabaAlscUnionKbcpxPositiveOrderGetRequest();
+        req.setDateType(1L);
+        req.setEndDate(endTime);
+        req.setBizUnit(2L);
+        req.setPageSize(50L);
+        req.setPageNumber(1L);
+        req.setStartDate(startTime);
+        req.setPid(pid);
+        req.setIncludeUsedStoreId(false);
+        AlibabaAlscUnionKbcpxPositiveOrderGetResponse rsp = client.execute(req);
 
         // 打印日志，请求接口
         log.info("请求接口：" + "officialactivity");

service/src/main/java/com/hfkj/service/order/BsOrderService.java

@@ -74,6 +74,7 @@ public interface BsOrderService {
 
     void getOrderMeiTuanList(String startTime , String endTime);
 
+    void getOrderElmList(String startTime , String endTime);
     /**
      * @MethodName getOrderListParent
      * @Description: 获取订单

service/src/main/java/com/hfkj/service/order/Impl/BsOrderServiceImpl.java

@@ -181,6 +181,15 @@ public class BsOrderServiceImpl implements BsOrderService {
         }
     }
 
+    @Override
+    public void getOrderElmList(String startTime, String endTime) {
+        try {
+            meiTuanOrder(startTime , endTime);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        }
+    }
+
     @Override
     public List<BsOrderModel> getOrderListParent(Map<String, Object> map) {