commit

PddServer/src/main/java/org/ta/pddserver/config/PddAPIConfig.java

@@ -3,25 +3,25 @@ package org.ta.pddserver.config;
 public class PddAPIConfig {
     // 临沂海际韩国集运 生产环境参数
     // 应用基础参数
-    public static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
-    public static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
-    // 基础API地址
-    public static final String URL = "https://ark-api.pinduoduo.com/ark/router";
-    // 工单API地址
-    public static final String URL_GD = "https://gw-api.pinduoduo.com/api/router";
-
+//    public static final String CLIENT_ID = "8f5f3f9c92e847b2894fc9c0afce3d61";
+//    public static final String CLIENT_SECRET = "281d79ad5117d20a51efb9e7b0d5f7ee336399b0";
+//    // 基础API地址
+//    public static final String URL = "https://ark-api.pinduoduo.com/ark/router";
+//    // 工单API地址
+//    public static final String URL_GD = "https://gw-api.pinduoduo.com/api/router";
+//
     // 基础API地址
     public static final String BASE_URL = "https://gw-api.pinduoduo.com/api/router";
 
 
     // 临沂海际韩国集运 测试环境参数
     // 应用基础参数
-//    public static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
-//    public static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
-//    // 基础API地址
-//    public static final String URL = "https://opengw-api.hutaojie.com/ark/router";
-//    // 工单API地址
-//    public static final String URL_GD = "https://opengw-api.hutaojie.com/api/router";
+    public static final String CLIENT_ID = "d0217707e1194c46b57e696ac7619a06";
+    public static final String CLIENT_SECRET = "a5aba84483d8387030899f01276b06a194942470";
+    // 基础API地址
+    public static final String URL = "https://opengw-api.hutaojie.com/ark/router";
+    // 工单API地址
+    public static final String URL_GD = "https://opengw-api.hutaojie.com/api/router";
 
 
 

PddServer/src/main/java/org/ta/pddserver/controller/DataGetController.java

@@ -119,7 +119,7 @@ public class DataGetController {
     /*待拣货列表*/
     @PostMapping("/outboundList")
     public JSONObject outboundList(HttpServletRequest request, @RequestBody CollectOrderListRequest collectOrderListRequest) {
-        collectOrderListRequest.setStatus(StatusEnum.FINISHOUTBOUND.getCode());
+        collectOrderListRequest.setStatus("" + StatusEnum.FINISHOUTBOUND.getCode());
         if (collectOrderListRequest.getSize() > 100) {
             collectOrderListRequest.setSize(100);
         }

PddServer/src/main/java/org/ta/pddserver/entity/UserEntity.java

+package org.ta.pddserver.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName("user")
+@Data
+public class UserEntity {
+
+    @TableId(value = "uid")
+    private String uid;
+
+    @TableField(value = "created")
+    private String created;
+
+    @TableField(value = "updated")
+    private String updated;
+
+    @TableField(value = "state")
+    private Integer state;
+
+    @TableField(value = "remarks")
+    private String remarks;
+
+    @TableField(value = "status")
+    private Integer status;
+
+    @TableField(value = "name")
+    private String name;
+
+    @TableField(value = "account")
+    private String account;
+
+    @TableField(value = "password")
+    private String password;
+
+}

PddServer/src/main/java/org/ta/pddserver/mapper/LogOrderMailDetailIoMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Select;
 import org.ta.pddserver.entity.LogOrderMailDetailIoEntity;
 import org.ta.pddserver.model.api.request.LogOrderMailDetailIoRequest;
 import org.ta.pddserver.model.api.response.LogOrderMailDetailIoListResponse;
+import org.ta.pddserver.model.api.response.MailDetailIoSelectResponse;
 
 import java.util.List;
 
@@ -23,4 +24,7 @@ public interface LogOrderMailDetailIoMapper extends BaseMapper<LogOrderMailDetai
 
     @Select("SELECT `uid`, `created`,`status`, `logisticsOrderCode`, `expressCode`, `mailNo`, `action` FROM `log_order_mail_detail_io` WHERE `mailNo` = #{mailNo} AND `status` = 60 AND `action` = 'FINISHOUTBOUND';")
     LogOrderMailDetailIoEntity findOutboundByMailNo(String mailNo);
+
+    @Select("SELECT `uid`, `created`, `updated`, `logisticsOrderCode`, `expressCode`, `mailNo`, `action` FROM `log_order_mail_detail_io` WHERE `mailNo` = #{mailNo} AND `action` = #{action}")
+    MailDetailIoSelectResponse findInfoByMailNoAction(String mailNo, String action);
 }

PddServer/src/main/java/org/ta/pddserver/mapper/UserMapper.java

+package org.ta.pddserver.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.ta.pddserver.entity.AreaEntity;
+import org.ta.pddserver.entity.UserEntity;
+import org.ta.pddserver.model.api.request.AreaListRequest;
+import org.ta.pddserver.model.api.request.UserRequest;
+import org.ta.pddserver.model.api.response.LogOrderListResponse;
+import org.ta.pddserver.model.api.response.UserListResponse;
+
+import java.util.List;
+
+@Mapper
+public interface UserMapper extends BaseMapper<UserEntity> {
+
+    @Select("SELECT * FROM `user` WHERE  `account` = #{account}")
+    UserEntity getInfoByAccount(String account);
+
+    @Select("SELECT `uid` , `name` ,`status`, `account`, `created` FROM `user` WHERE `state` > 0 AND `account` LIKE '%${account}%' AND `status` LIKE '%${status}%' ORDER BY uid DESC LIMIT #{offset}, #{size};")
+    List<UserListResponse> getListByRequest(UserRequest param);
+
+    @Select("SELECT COUNT(`uid`) FROM `user` WHERE `state` > 0 AND `account` LIKE '%${account}%' AND `status` LIKE '%${status}%' ")
+    Integer countUsable(UserRequest param);
+}

PddServer/src/main/java/org/ta/pddserver/model/api/request/CollectOrderListRequest.java

@@ -24,7 +24,7 @@ public class CollectOrderListRequest extends PageTool {
             defaultValue = "",
             requiredMode = Schema.RequiredMode.REQUIRED // 必填
     )
-    private int status;
+    private String status;
 
     private int num;
 

PddServer/src/main/java/org/ta/pddserver/model/api/request/MailDetailIoSelectRequest.java

+package org.ta.pddserver.model.api.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class MailDetailIoSelectRequest {
+
+    private String mailNo;
+
+    private String action;
+}

PddServer/src/main/java/org/ta/pddserver/model/api/request/UnpackNoticeSelectRequest.java

+package org.ta.pddserver.model.api.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class UnpackNoticeSelectRequest{
+
+    private String orderCode;
+
+}

PddServer/src/main/java/org/ta/pddserver/model/api/request/UserListRequest.java

+package org.ta.pddserver.model.api.request;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class UserListRequest extends PageTool {
+
+
+    private String name;
+
+    private String status;
+
+}

PddServer/src/main/java/org/ta/pddserver/model/api/request/UserRequest.java

+package org.ta.pddserver.model.api.request;
+
+import lombok.Data;
+import org.ta.pddserver.model.common.PageTool;
+
+@Data
+public class UserRequest extends PageTool {
+
+    private String account;
+
+    private String password;
+
+    private String name;
+}

PddServer/src/main/java/org/ta/pddserver/model/api/response/MailDetailIoSelectResponse.java

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class MailDetailIoSelectResponse {
+
+    private String uid;
+
+    private String created;
+
+    private String updated;
+
+    private String logisticsOrderCode;
+
+    private String expressCode;
+
+    private String mailNo;
+
+    private String action;
+
+}

PddServer/src/main/java/org/ta/pddserver/model/api/response/UnpackNoticeSelectResponse.java

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class UnpackNoticeSelectResponse {
+
+    private String uid;
+
+    private String created;
+
+    private String updated;
+
+    private String buyerCode;
+
+    private String consoType;
+
+    private String consoWarehouseCode;
+
+    private String deliveryType;
+
+    private String providerCode;
+
+    private String orderCode;
+}

PddServer/src/main/java/org/ta/pddserver/model/api/response/UserListResponse.java

+package org.ta.pddserver.model.api.response;
+
+import lombok.Data;
+
+@Data
+public class UserListResponse {
+
+    private String uid;
+
+    private String orderCode;
+
+    private String orderSn;
+
+    private String logisticsOrderCode;
+
+    private String itemId;
+
+    private String itemName;
+
+    private String categoryName;
+
+    private int itemQuantity;
+
+    private int weightTotal;
+
+    private int actualAmount;
+
+    private String productName;
+
+    private int exportDecAmount;
+
+}

PddServer/src/main/java/org/ta/pddserver/service/UserService.java

+package org.ta.pddserver.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.ta.pddserver.entity.AreaEntity;
+import org.ta.pddserver.entity.UserEntity;
+
+public interface UserService extends IService<UserEntity> {
+
+}

PddServer/src/main/java/org/ta/pddserver/service/impl/LogOrderMailDetailIoImpl.java

@@ -6,7 +6,9 @@ import org.springframework.stereotype.Service;
 import org.ta.pddserver.entity.LogOrderMailDetailIoEntity;
 import org.ta.pddserver.mapper.LogOrderMailDetailIoMapper;
 import org.ta.pddserver.model.api.request.LogOrderMailDetailIoRequest;
+import org.ta.pddserver.model.api.request.MailDetailIoSelectRequest;
 import org.ta.pddserver.model.api.response.LogOrderMailDetailIoListResponse;
+import org.ta.pddserver.model.api.response.MailDetailIoSelectResponse;
 import org.ta.pddserver.service.LogOrderMailDetailIoService;
 
 import java.util.HashMap;
@@ -36,4 +38,8 @@ public class LogOrderMailDetailIoImpl extends ServiceImpl<LogOrderMailDetailIoMa
     public LogOrderMailDetailIoEntity getOutboundByMailNo(String mailNo) {
         return this.baseMapper.findOutboundByMailNo(mailNo);
     }
+
+    public MailDetailIoSelectResponse findInfoByMailNoAction(String mailNo, String action) {
+        return baseMapper.findInfoByMailNoAction(mailNo, action);
+    }
 }
\ No newline at end of file

PddServer/src/main/java/org/ta/pddserver/service/impl/UserImpl.java

+package org.ta.pddserver.service.impl;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.stereotype.Service;
+import org.ta.commoncore.model.User;
+import org.ta.pddserver.entity.UserEntity;
+import org.ta.pddserver.mapper.UserMapper;
+import org.ta.pddserver.model.api.request.LogOrderListRequest;
+import org.ta.pddserver.model.api.request.UserRequest;
+import org.ta.pddserver.model.api.response.LogOrderListResponse;
+import org.ta.pddserver.model.api.response.UserListResponse;
+import org.ta.pddserver.service.UserService;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class UserImpl extends ServiceImpl<UserMapper, UserEntity> implements UserService {
+
+
+    public UserEntity getInfoByAccount(String account) {
+        return baseMapper.getInfoByAccount(account);
+    }
+
+    public Map<String, Object> getListByRequest(UserRequest param) {
+        Integer count = baseMapper.countUsable(param);
+        param.checkPage(count,20);
+        List<UserListResponse> list = baseMapper.getListByRequest(param);
+        Map<String, Object> map = new HashMap<>();
+        map.put("total", count);
+        map.put("list", list);
+        map.put("page", param.getPage());
+        return map;
+    }
+
+//    public JSONObject checkUser(HttpServletRequest request) {
+//        UserEntity userEntity=this.getOne(this.getUserIDFromOnlineData(request));
+//    }
+}
\ No newline at end of file

PddServer/src/main/resources/application.yaml

@@ -7,15 +7,15 @@ spring:
 
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-#    username: root
-#    password: root
+    url: jdbc:mysql://192.168.2.222:3306/pdd_api?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+    username: root
+    password: root
 #    url: jdbc:mysql://lyhj-mysql.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
 #    username: pdd
 #    password: pdd123
-    url: jdbc:mysql://rm-j6cv8n7zx12x0sqreuo.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
-    username: pdd
-    password: pdd123
+#    url: jdbc:mysql://rm-j6cv8n7zx12x0sqreuo.mysql.rds.aliyuncs.com:3306/pdd_prod?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT
+#    username: pdd
+#    password: pdd123
     hikari:
       minimum-idle: 5  # 最小空闲连接数
       maximum-pool-size: 10  # 最大活跃连接数
@@ -26,8 +26,8 @@ spring:
   application:
     name: PddServer
 server:
-#  port: 9000 # 正式端口号 - 向拼多多正式环境开放接口
-  port: 9100 # 正式端口号 - 向海际系统正式环境开放接口
+  port: 9000 # 正式端口号 - 向拼多多正式环境开放接口
+#  port: 9100 # 正式端口号 - 向海际系统正式环境开放接口
 #  port: 8600 # 测试端口号
 logging:
   level:

PddServer/src/test/java/org/ta/pddserver/CommonTest.java

@@ -451,11 +451,11 @@ public class CommonTest {
         notifyRequest.setPackageInfos(new ArrayList<>());
         PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo1 = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
         notifyRequest.getPackageInfos().add(packageInfo1);
-        packageInfo1.setWeight(2000L);
-        packageInfo1.setWidth(30L);
-        packageInfo1.setHeight(30L);
-        packageInfo1.setLength(30L);
-        packageInfo1.setActualWeight(2000L);
+//        packageInfo1.setWeight(2000L);
+//        packageInfo1.setWidth(30L);
+//        packageInfo1.setHeight(30L);
+//        packageInfo1.setLength(30L);
+//        packageInfo1.setActualWeight(2000L);
         packageInfo1.setConsoType("SEA");
         packageInfo1.setGoodsType("SPECIAL");
 
@@ -933,11 +933,11 @@ public class CommonTest {
         notifyRequest.setPackageInfos(new ArrayList<>());
         PddServiceConsoCoBizActionNotifyRequest.PackageInfo packageInfo0 = new PddServiceConsoCoBizActionNotifyRequest.PackageInfo();
         notifyRequest.getPackageInfos().add(packageInfo0);
-        packageInfo0.setWeight(600L);
-        packageInfo0.setWidth(30L);
-        packageInfo0.setHeight(30L);
-        packageInfo0.setLength(30L);
-        packageInfo0.setActualWeight(600L);
+//        packageInfo0.setWeight(600L);
+//        packageInfo0.setWidth(30L);
+//        packageInfo0.setHeight(30L);
+//        packageInfo0.setLength(30L);
+//        packageInfo0.setActualWeight(600L);
         packageInfo0.setConsoType("SEA");
         packageInfo0.setGoodsType("NORMAL");