Merge remote-tracking branch 'origin/dev' into dev

service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/controller/SynchronizedAmountController.java

@@ -45,4 +45,14 @@ public class SynchronizedAmountController {
         log.info("支付的参数{}" + payTwoOrder.toString());
         return accountRechargeService.aliPayPcTwo(payTwoOrder);
     }
+
+    @PostMapping("/free/sync")
+    @ApiOperation("免费同步一个月的历史订单")
+    public CommonResult<Object> freeSync(@RequestBody PayTwoOrder payTwoOrder) {
+        log.info("免费开通的商家信息：{}", payTwoOrder.toString());
+        if (ObjectUtil.isEmpty(payTwoOrder) || payTwoOrder.getMasterUserId() == null || payTwoOrder.getOrderStartTime() == null || payTwoOrder.getOrderEndTime() == null) {
+            return new CommonResult<>().error("参数异常");
+        }
+        return synchronizedAmountService.freeSync(payTwoOrder);
+    }
 }

service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/SynchronizedAmountService.java

@@ -1,6 +1,7 @@
 package com.hchbox.module.service;
 
 import com.hchbox.model.param.CommonResult;
+import com.hchbox.module.entity.PayTwoOrder;
 import com.hchbox.vo.SubAccountsVo;
 
 /**
@@ -16,4 +17,12 @@ public interface SynchronizedAmountService {
      * @return
      */
     CommonResult<Object> synchronizedAmount(SubAccountsVo subAccountsVo);
+
+    /**
+     * 免费同步淘宝历史订单
+     *
+     * @param payTwoOrder
+     * @return
+     */
+    CommonResult<Object> freeSync(PayTwoOrder payTwoOrder);
 }

service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/module/service/impl/SynchronizedAmountServiceImpl.java

@@ -1,10 +1,14 @@
 package com.hchbox.module.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONObject;
 import com.hchbox.api.RequestCore;
 import com.hchbox.constant.DefaultNumberConstants;
 import com.hchbox.model.param.CommonResult;
+import com.hchbox.module.dao.PayTwoOrderRepository;
 import com.hchbox.module.entity.PayTwoOrder;
 import com.hchbox.module.service.SynchronizedAmountService;
 import com.hchbox.vo.SubAccountsVo;
@@ -30,6 +34,8 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService
     private Double budgetAmount;
     @Resource
     private RequestCore requestCore;
+    @Resource
+    private PayTwoOrderRepository payTwoOrderRepository;
 
     @Override
     public CommonResult<Object> synchronizedAmount(SubAccountsVo subAccountsVo) {
@@ -68,4 +74,30 @@ public class SynchronizedAmountServiceImpl implements SynchronizedAmountService
         }
         return new CommonResult<>().success(payTwoOrder);
     }
-}
+
+    @Override
+    public CommonResult<Object> freeSync(PayTwoOrder payTwoOrder) {
+
+        JSONObject jsonObject2 = requestCore.updateSellerAccount(payTwoOrder);
+        if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject2.get("code")) {
+            log.error("+++++++++++++免费开通同步淘宝历史订单失败,id:{}++++++++++++", payTwoOrder.getMasterUserId());
+            return new CommonResult<>().error("免费开通失败");
+        }
+        payTwoOrder.setPayType(DefaultNumberConstants.ZERO_NUMBER);
+        payTwoOrder.setIdenticalAmount(null);
+        payTwoOrder.setAnticipateNum(NumberUtil.div(payTwoOrder.getAmount(), BigDecimal.valueOf(amount)).longValue());
+        payTwoOrder.setStatus(DefaultNumberConstants.ZERO_NUMBER);
+        payTwoOrder.setPayTime(DateUtil.date());
+        PayTwoOrder save = payTwoOrderRepository.save(payTwoOrder);
+        if (ObjectUtil.isNotEmpty(save)) {
+            JSONObject jsonObject = requestCore.savePayTwoOrder(save);
+            if (DefaultNumberConstants.TWO_HUNDRED != (Integer) jsonObject.get("code")) {
+                log.error("==========免费开通订单同步，同步到聚石塔错误，{}", jsonObject);
+                return new CommonResult<>().error("同步错误");
+            }
+            return CommonResult.successfulOperation();
+        }
+        log.error("+++++++++++++免费开通同步淘宝历史订单，保存订单失败，{}", save);
+        return new CommonResult<>().error("保存订单失败");
+    }
+}

service/trade-service-source/trade-service-source-core/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
 
 spring:
   profiles:
-    active: dev
+    active: prod
   servlet:
     multipart:
       max-file-size: 200MB #单个文件上传大小

service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/dao/TradeJpa.java

@@ -87,7 +87,7 @@ public class TradeJpa {
             }
         }
         if (null != day) {
-            sql.append("and t.created < :offDay ");
+            sql.append("and t.consign_time < :offDay ");
         }
         String sellerNick = appSetting.getSellerNick();
         if (StrUtil.isNotEmpty(sellerNick)) {

service/trade-service-wwsend/trade-service-wwsend-task/src/main/java/com/hchbox/module/service/impl/ObtainInfoServiceImpl.java

@@ -22,9 +22,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -63,6 +61,7 @@ public class ObtainInfoServiceImpl implements ObtainInfoService {
         client = new DefaultTaobaoClient(miProperties.getServerUrl(), miProperties.getAppKey(), miProperties.getAppSecret());
         AtomicInteger count = new AtomicInteger();
         List<TopTrade> allByGmtSync = topTradeRepository.findAllByGmtSync();
+        log.info("===============ObtainInfoJob同步前一天数据应插入条数：{}===============",allByGmtSync.size());
         if (allByGmtSync.size() > 0) {
             allByGmtSync.stream().forEach(ac ->{
                 UserOaidInfo userOaidInfo = new UserOaidInfo();
@@ -89,6 +88,7 @@ public class ObtainInfoServiceImpl implements ObtainInfoService {
                     }
                 }
             });
+            log.info("===============ObtainInfoJob同步前一天实际插入数据条数：{}===============",count.get());
             //插入存入记录
             saveObtainInfoRecord(0,allByGmtSync.size(),count.get());
         }
@@ -149,7 +149,7 @@ public class ObtainInfoServiceImpl implements ObtainInfoService {
             List<TopOaidDecryptResponse.Receiver> receiverList = rsp.getReceiverList();
             return receiverList.get(0);
         }catch (Exception e){
-            log.info("===========解密oaid失败========");
+            log.info("=========== 解密oaid失败，oaid:{}, sessionKey:{}========",oaid,sessionKey);
             return null;
         }
     }

service/trade-service-wwsend/trade-service-wwsend-task/src/main/resources/application.yml

@@ -60,5 +60,5 @@ hchbox:
 filesave:
   aes:
     secret: bytb
-  route: /usr/local/webapp/task
+  route: /usr/local/taomidata
   identification: bytb

trade-common/src/main/java/com/hchbox/model/entity/BasePayTwoOrder.java

@@ -52,12 +52,12 @@ public class BasePayTwoOrder implements Serializable {
 
     @Column(name = "order_start_time")
     @ApiModelProperty(value = "同步开始时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN, timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATE_PATTERN, timezone = "GMT+8")
     private Date orderStartTime;
 
     @Column(name = "order_end_time")
     @ApiModelProperty(value = "同步结束时间")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN, timezone = "GMT+8")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATE_PATTERN, timezone = "GMT+8")
     private Date orderEndTime;
 
     @Column(name = "nick_name")