lyhzzz 11 månader sedan
förälder
incheckning
bca28c92bf

+ 2 - 2
src/main/java/com/fdkankan/ucenter/common/BaseController.java

@@ -119,8 +119,8 @@ public class BaseController {
     protected String getSign(){
         return request.getHeader("sign");
     }
-    protected String getOrigin(){
-        return request.getHeader("origin");
+    protected String getAgentKey(){
+        return request.getHeader("agent-key");
     }
 
     protected Integer getTimeZone(){

+ 2 - 3
src/main/java/com/fdkankan/ucenter/controller/OrderController.java

@@ -79,7 +79,6 @@ public class OrderController extends BaseController {
      */
     @PostMapping("/getIncrementOrDownloadPrice")
     public Result getIncrementOrDownloadPrice(@RequestBody OrderParam param){
-        String origin = request.getHeader("origin");
         String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         return Result.success(orderService.getIncrementOrDownloadPrice(param));
@@ -93,7 +92,7 @@ public class OrderController extends BaseController {
         String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         param.setTimeZoneOff(getTimeZone());
-        param.setOrigin(getOrigin());
+        param.setAgentKey(getAgentKey());
         return Result.success(orderService.downloadOrder(param));
     }
 
@@ -105,7 +104,7 @@ public class OrderController extends BaseController {
         String username = JwtUtil.getUsername(getToken());
         param.setUserName(username);
         param.setTimeZoneOff(getTimeZone());
-        param.setOrigin(getOrigin());
+        param.setAgentKey(getAgentKey());
         return Result.success(orderService.incrementOrder(param));
     }
 

+ 2 - 2
src/main/java/com/fdkankan/ucenter/entity/DownloadOrder.java

@@ -126,6 +126,6 @@ public class DownloadOrder implements Serializable {
     @TableField("time_zone_off")
     private Integer timeZoneOff;
 
-    @TableField("origin_url")
-    private String originUrl;
+    @TableField("agent_key")
+    private String agentKey;
 }

+ 2 - 2
src/main/java/com/fdkankan/ucenter/entity/IncrementAutoOrder.java

@@ -68,6 +68,6 @@ public class IncrementAutoOrder implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
-    @TableField("origin_url")
-    private String originUrl;
+    @TableField("agent_key")
+    private String agentKey;
 }

+ 2 - 2
src/main/java/com/fdkankan/ucenter/entity/IncrementOrder.java

@@ -135,6 +135,6 @@ public class IncrementOrder implements Serializable {
     @TableField("auto_order_id")
     private Integer autoOrderId;
 
-    @TableField("origin_url")
-    private String originUrl;
+    @TableField("agent_key")
+    private String agentKey;
 }

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/IIncrementAutoOrderService.java

@@ -15,7 +15,7 @@ import com.fdkankan.ucenter.pay.paypal.sdk.AutoPaypalVo;
  */
 public interface IIncrementAutoOrderService extends IService<IncrementAutoOrder> {
 
-    void addOrder(Long userId, Integer incrementTypeId, Long incrementId, String orderSn,String origin);
+    void addOrder(Long userId, Integer incrementTypeId, Long incrementId, String orderSn,String agentKey);
 
     IncrementAutoOrder getByIncrementId(Long incrementId);
 

+ 4 - 4
src/main/java/com/fdkankan/ucenter/service/impl/AgentNewLogServiceImpl.java

@@ -24,8 +24,8 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
     @Autowired
     IIncrementTypeService incrementTypeService;
 
-    @Value("${agent.wherefor.url:https://platform.4dkankan.ai}")
-    private String whereforUrl;
+    @Value("${agent.wherefor.key:wherefor}")
+    private String whereforKey;
 
     @Value("${agent.wherefor.id:5}")
     private Integer whereforId;
@@ -51,7 +51,7 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
 
     @Override
     public void addByOrder(DownloadOrder responseIncrementOrder) {
-        if(StringUtils.isNotBlank(responseIncrementOrder.getOriginUrl()) && whereforUrl.equals(responseIncrementOrder.getOriginUrl())){
+        if(StringUtils.isNotBlank(responseIncrementOrder.getAgentKey()) && whereforKey.equals(responseIncrementOrder.getAgentKey())){
             AgentNewLog log = new AgentNewLog();
             log.setType(2);
             log.setAgentId(whereforId);
@@ -64,7 +64,7 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
 
     @Override
     public Boolean addByOrder(IncrementOrder responseIncrementOrder) {
-        if(StringUtils.isNotBlank(responseIncrementOrder.getOriginUrl()) && whereforUrl.equals(responseIncrementOrder.getOriginUrl())){
+        if(StringUtils.isNotBlank(responseIncrementOrder.getAgentKey()) && whereforKey.equals(responseIncrementOrder.getAgentKey())){
             AgentNewLog log = new AgentNewLog();
             if(responseIncrementOrder.getIncrementType() != null){
                 IncrementType incrementType = incrementTypeService.getById(responseIncrementOrder.getIncrementType());

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/impl/DownloadOrderServiceImpl.java

@@ -140,7 +140,7 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
         downloadOrderEntity.setRecStatus("A");
         downloadOrderEntity.setCreateTime(DateUserUtil.getDate(new Date()));
         downloadOrderEntity.setUpdateTime(DateUserUtil.getDate(new Date()));
-        downloadOrderEntity.setOriginUrl(param.getOrigin());
+        downloadOrderEntity.setAgentKey(param.getAgentKey());
         this.save(downloadOrderEntity);
         return downloadOrderEntity;
     }

+ 2 - 2
src/main/java/com/fdkankan/ucenter/service/impl/IncrementAutoOrderServiceImpl.java

@@ -43,13 +43,13 @@ public class IncrementAutoOrderServiceImpl extends ServiceImpl<IIncrementAutoOrd
     IUserService userService;
 
     @Override
-    public void addOrder(Long userId, Integer incrementTypeId, Long incrementId, String orderSn,String origin) {
+    public void addOrder(Long userId, Integer incrementTypeId, Long incrementId, String orderSn,String agentKey) {
         IncrementAutoOrder autoOrder = new IncrementAutoOrder();
         autoOrder.setUserId(userId);
         autoOrder.setIncrementTypeId(incrementTypeId);
         autoOrder.setUserIncrementId(incrementId);
         autoOrder.setOrderSn(orderSn);
-        autoOrder.setOriginUrl(origin);
+        autoOrder.setAgentKey(agentKey);
         this.save(autoOrder);
     }
 

+ 3 - 3
src/main/java/com/fdkankan/ucenter/service/impl/IncrementOrderServiceImpl.java

@@ -227,9 +227,9 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         incrementOrderEntity.setMonthQy(param.getMonthQy());
         incrementOrderEntity.setTimeZoneOff(param.getTimeZoneOff());
         incrementOrderEntity.setAutoPay(param.getAutoPay());
-        incrementOrderEntity.setOriginUrl(param.getOrigin());
+        incrementOrderEntity.setAgentKey(param.getAgentKey());
         if(param.getAutoPay() != null && param.getAutoPay()==1){
-            incrementAutoOrderService.addOrder(user.getId(),incrementType.getId(),param.getIncrementId(),incrementOrderEntity.getOrderSn(),param.getOrigin());
+            incrementAutoOrderService.addOrder(user.getId(),incrementType.getId(),param.getIncrementId(),incrementOrderEntity.getOrderSn(),param.getAgentKey());
             return incrementOrderEntity;
         }
         this.save(incrementOrderEntity);
@@ -291,7 +291,7 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
         incrementOrder.setAutoPay(1);
         incrementOrder.setAutoOrderId(incrementAutoOrder.getId());
         incrementOrder.setTimeZoneOff(-480);
-        incrementOrder.setOriginUrl(incrementAutoOrder.getOriginUrl());
+        incrementOrder.setAgentKey(incrementAutoOrder.getAgentKey());
         IncrementType incrementType = incrementTypeService.getById(incrementAutoOrder.getIncrementTypeId());
         if(incrementType != null && incrementType.getValidTimeType() == 0){
             incrementOrder.setMemberLevels("PR");

+ 1 - 1
src/main/java/com/fdkankan/ucenter/vo/request/DownNumParam.java

@@ -26,7 +26,7 @@ public class DownNumParam {
 
     private Integer autoPay ;
 
-    private String origin;
+    private String agentKey;
 
     public Integer getIncrementType() {
         if(incrementType == null && StringUtils.isNotBlank(skuSn) && StringUtils.isNumeric(skuSn)){