修改部分实体对应 服务正常运行

service/trade-service-source/trade-service-source-core/src/main/java/com/hchbox/controller/SendMessageController.java

@@ -45,14 +45,13 @@ public class SendMessageController {
             return new CommonResult<String>().failed(checkMessage);
         }
 
-        //保存发送任务
+        // 保存发送任务
         taskSendMessageService.createTaskSendMessage(submitSendMessageVo,sellerAccount);
 
         // 缓存信息
         taskAccountService.cacheDeductionByAccount(sellerAccount.getNick(), -submitSendMessageVo.getBuyerInfoList().size());
 
         // TODO 设置定时任务
-
         return CommonResult.successfulOperation();
     }
 

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/entity/master/AutoTaskMessage.java

@@ -16,55 +16,76 @@ import java.util.Date;
 @Table(name = "auto_task_message")
 public class AutoTaskMessage implements Serializable {
 
+    private static final long serialVersionUID = 4550554800647798909L;
+
     @Id
     @Column(name = "id")
     @ApiModelProperty(value = "id")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    private Long    userId;
+    @Column(name = "user_id")
+    @ApiModelProperty("用户id")
+    private Long userId;
 
-    @ApiModelProperty("类型")
+    @ApiModelProperty("状态值")
     private Integer status;
 
+    @Column(name = "task_name")
     @ApiModelProperty("任务名称")
-    private String  taskName;
+    private String taskName;
 
+    @Column(name = "seller_nick")
     @ApiModelProperty("买家昵称")
-    private String  sellerNick;
+    private String sellerNick;
-
-    private String  taksInfo;    // 任务信息
-
-    private Date    gmtCreate;   //
-
-    private Date    gmtUpdate;
-
-    private Date    startDt;     // 任务开始时间
-
-    private Date    endDt;       // 任务结束时间
 
-    private Integer isOver;      // 0 默认未完成终止 1 明日再发
+    @Column(name = "task_info")
+    @ApiModelProperty("任务信息")
+    private String taskInfo;
 
-    private Integer isRetry;     // 重试次数 0 代表不重试
+    @Column(name = "create_time")
+    @ApiModelProperty("创建时间")
+    private Date createTime;
 
-    private String  templt;      // 模板
+    @Column
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
 
-    private Integer isRemark;    // 是否备注 0不备注 1备注
+    @Column(name = "start_date")
+    @ApiModelProperty("任务开始时间")
+    private Date startDate;
 
-    private String  result;      // 结果
+    @Column(name = "end_date")
+    @ApiModelProperty("任务结束时间")
+    private Date endDate;
 
-    private String  memo;
+    @Column(name = "is_finish")
+    @ApiModelProperty("默认未完成终止 1 明日再发")
+    private Boolean isFinish;
 
-    private Integer type;        // 0 应用dsr选中回访提交 1 为 手动提交 (应用 团队 后台 )
+    @Column(name = "is_retry")
+    @ApiModelProperty("重试次数 0 代表不重试")
+    private Boolean isRetry;
 
-    private Integer  sendType;
+    @Column(name = "template")
+    @ApiModelProperty("模板")
+    private String template;
 
-    private Date    statStartDt; // 统计开始时间
+    @Column(name = "send_type")
+    @ApiModelProperty("0 应用dsr选中回访提交 1 为 手动提交 (应用 团队 后台 )")
+    private Integer sendType;
 
-    private Date    statEndDt;   // 统计结束时间
+    @Column(name = "stat_start_date")
+    @ApiModelProperty("统计开始时间")
+    private Date statStartDate;
 
-    private String  statType;    // 统计类型 urgerate催评  marketing营销
+    @Column(name = "stat_end_date")
+    @ApiModelProperty("统计结束时间")
+    private Date statEndDt;
 
+    @Column(name = "stat_type")
+    @ApiModelProperty("统计类型")
+    private String statType;
 
 
 }

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/entity/master/TopOrder.java

@@ -0,0 +1,42 @@
+package com.hchbox.entity.master;
+
+import com.taobao.api.domain.Order;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @author Enzo
+ * @date : 2021/7/20
+ */
+
+
+@Data
+@Entity
+@Table(name = "top_order")
+@EqualsAndHashCode(callSuper = true)
+public class TopOrder extends Order implements Serializable {
+
+    private static final long serialVersionUID = -3145039173601345790L;
+
+    @Id
+    @Column(name = "order_id")
+    @ApiModelProperty(value = "id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    protected Long id;
+
+    @ApiModelProperty(value = "订单id")
+    @Column(name = "tid")
+    private Long tid;
+
+
+    @JoinColumn(name = "t_id")
+    @ApiModelProperty(value = "总订单")
+    @ManyToOne(cascade = {CascadeType.MERGE, CascadeType.REFRESH}, optional = false)
+    private TopTrade topTrade;
+
+
+}

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/entity/master/TopTrade.java

@@ -6,8 +6,12 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author Enzo
@@ -25,5 +29,7 @@ public class TopTrade extends BaseTrade implements Serializable {
 
     private static final long serialVersionUID = -9202886024083895946L;
 
-
+    @OneToMany(mappedBy = "topTrade", fetch = FetchType.LAZY)
+    @ApiModelProperty("订单集合")
+    private List<TopOrder> orderList;
 }

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/AppSettingRepository.java

@@ -3,11 +3,13 @@ package com.hchbox.repository.master;
 import com.hchbox.entity.master.AppSetting;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author Enzo
  * @date : 2021/7/2
  */
+@Repository
 public interface AppSettingRepository  extends JpaRepository<AppSetting, Long>, JpaSpecificationExecutor<AppSetting> {
 
     /**

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/AutoTaskMessageInfoRepository.java

@@ -3,11 +3,13 @@ package com.hchbox.repository.master;
 import com.hchbox.entity.master.AutoTaskMessageInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author Enzo
  * @date : 2021/7/15
  */
+@Repository
 public interface AutoTaskMessageInfoRepository extends JpaRepository<AutoTaskMessageInfo, Long>, JpaSpecificationExecutor<AutoTaskMessageInfo> {
 
     /**

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/AutoTaskMessageRepository.java

@@ -3,6 +3,8 @@ package com.hchbox.repository.master;
 import com.hchbox.entity.master.AutoTaskMessage;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
 import java.util.Date;
 
@@ -10,6 +12,7 @@ import java.util.Date;
  * @author Enzo
  * @date : 2021/7/15
  */
+@Repository
 public interface AutoTaskMessageRepository extends JpaRepository<AutoTaskMessage, Long>, JpaSpecificationExecutor<AutoTaskMessage> {
 
 
@@ -20,5 +23,6 @@ public interface AutoTaskMessageRepository extends JpaRepository<AutoTaskMessage
      * @param endTime
      * @return
      */
+    @Query("select  m  from AutoTaskMessage m where m.sendType = ?1 and m.createTime between ?2 and ?3")
     AutoTaskMessage findAutoTaskMessageTypeBetweenTime(Integer type, Date startTime, Date endTime);
 }

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/HistoryTradeRepository.java

@@ -3,11 +3,13 @@ package com.hchbox.repository.master;
 import com.hchbox.entity.master.HistoryTrade;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author Enzo
  * @date : 2021/6/29
  */
+@Repository
 public interface HistoryTradeRepository  extends JpaRepository<HistoryTrade, Long>, JpaSpecificationExecutor<HistoryTrade> {
 
     /**

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/SellerAccountRepository.java

@@ -4,6 +4,7 @@ package com.hchbox.repository.master;
 import com.hchbox.entity.master.SellerAccount;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -15,13 +16,6 @@ import java.util.List;
 @Repository
 public interface SellerAccountRepository extends JpaRepository<SellerAccount, Long>, JpaSpecificationExecutor<SellerAccount> {
 
-    /**
-     * 查找 sellerAccount
-     *
-     * @param uid
-     * @return
-     */
-    SellerAccount findSellerAccountByUid(String uid);
 
 
 
@@ -33,13 +27,7 @@ public interface SellerAccountRepository extends JpaRepository<SellerAccount, Lo
     SellerAccount findSellerAccountByNick(String nick);
 
 
-    /**
+
-     * 账号查询
-     * @param nick
-     * @param subNick
-     * @return
-     */
-    SellerAccount findSellerAccountByNickAndSubNick(String nick,String subNick);
 
 
     /**

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/TopOrderRegistry.java

@@ -1,10 +1,10 @@
 package com.hchbox.repository.master;
 
-import com.hchbox.entity.master.Member;
+
-import com.hchbox.entity.master.SellerAccount;
+import com.hchbox.entity.master.TopOrder;
-import com.taobao.api.domain.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
@@ -12,7 +12,8 @@ import java.util.List;
  * @author Enzo
  * @date : 2021/7/15
  */
-public interface OrderRegistry extends JpaRepository<Order, Long>, JpaSpecificationExecutor<Order> {
+@Repository
+public interface TopOrderRegistry extends JpaRepository<TopOrder, Long>, JpaSpecificationExecutor<TopOrder> {
 
 
     /**
@@ -20,5 +21,5 @@ public interface OrderRegistry extends JpaRepository<Order, Long>, JpaSpecificat
      * @param tid
      * @return
      */
-    List<Order> findByTid(Long tid);
+    List<TopOrder> findByTid(Long tid);
 }

service/trade-service-source/trade-service-source-dao/src/main/java/com/hchbox/repository/master/TopTradeRepository.java

@@ -3,11 +3,13 @@ package com.hchbox.repository.master;
 import com.hchbox.entity.master.TopTrade;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
 
 /**
  * @author Enzo
  * @date : 2021/6/26
  */
+@Repository
 public interface TopTradeRepository extends JpaRepository<TopTrade, Long>, JpaSpecificationExecutor<TopTrade> {
 
     /**

service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/hander/RateAppBuyerPayHandler.java

@@ -20,13 +20,13 @@ public class RateAppBuyerPayHandler implements TaoBaoHandler<TaoBaoTradeMessage>
     private final TopTradeService topTradeService;
 
 
-
     /**
      * 处理 订单支付尾款逻辑
      */
     @Override
     public boolean onMessage(TaoBaoTradeMessage message) {
         if (message != null) {
+            log.info(" =============Receive transaction success message parameters start ============= ");
             return topTradeService.doAfterPayRemindMessage(message);
         }
         return Boolean.FALSE;

service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/SellerAccountServiceImpl.java

@@ -99,10 +99,9 @@ public class SellerAccountServiceImpl implements SellerAccountService {
 
     @Override
     public CommonResult<String> sellerAccountServiceByPurchaser(String purchaser, Integer levelNumber) {
-        String[] splitAccount = purchaser.split(StrUtil.COLON);
+        if (StringUtils.isNotBlank(purchaser)) {
-        if (splitAccount.length > DefaultConstants.ONE_NUMBER) {
             SellerAccount account = sellerAccountRepository.
-                    findSellerAccountByNickAndSubNick(splitAccount[0], splitAccount[1]);
+                    findSellerAccountByNick(purchaser);
             if (account != null && account.getLevel() != null
                     && !account.getLevel().equals(levelNumber)) {
                 // 不同套餐不能购买成功
@@ -116,9 +115,8 @@ public class SellerAccountServiceImpl implements SellerAccountService {
     @Override
     public Boolean updateAccountExpirationTime(UpdateSellerVo updateSellerVo) {
         if (updateSellerVo != null) {
-            String[] splitAccount = updateSellerVo.getPurchaser().split(StrUtil.COLON);
             SellerAccount account = sellerAccountRepository.
-                    findSellerAccountByNickAndSubNick(splitAccount[0], splitAccount[1]);
+                    findSellerAccountByNick(updateSellerVo.getPurchaser());
             if (account != null) {
                 // 等级大于原先等级 修改
                 if (updateSellerVo.getLevelNumber() != null && updateSellerVo.getLevelNumber() > account.getLevel()) {

service/trade-service-source/trade-service-source-taobao/src/main/java/com/hchbox/service/impl/TopTradeServiceImpl.java

@@ -5,9 +5,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import com.google.common.base.Splitter;
-import com.google.gson.JsonArray;
 import com.hchbox.config.MiProperties;
 import com.hchbox.constant.DefaultConstants;
 import com.hchbox.constant.PayConstants;
@@ -21,7 +18,7 @@ import com.hchbox.feign.ApiSendMessageClient;
 import com.hchbox.hander.message.TaoBaoTradeMessage;
 import com.hchbox.repository.master.AutoTaskMessageInfoRepository;
 import com.hchbox.repository.master.AutoTaskMessageRepository;
-import com.hchbox.repository.master.OrderRegistry;
+import com.hchbox.repository.master.TopOrderRegistry;
 import com.hchbox.repository.master.TopTradeRepository;
 import com.hchbox.service.*;
 import com.hchbox.util.CacheManagerUtil;
@@ -35,7 +32,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import springfox.documentation.spring.web.json.Json;
 
 import java.time.LocalTime;
 import java.util.ArrayList;
@@ -53,7 +49,7 @@ import java.util.stream.Stream;
 public class TopTradeServiceImpl implements TopTradeService {
 
 
-    private final OrderRegistry orderRegistry;
+    private final TopOrderRegistry orderRegistry;
 
     private final MiProperties miProperties;
 
@@ -186,7 +182,7 @@ public class TopTradeServiceImpl implements TopTradeService {
         // 使用本地数据
         Trade trade = topTradeRepository.findByTid(tid);
         if (trade != null) {
-            List<Order> topOrders = orderRegistry.findByTid(tid);
+            List<Order> topOrders = trade.getOrders();
             List<Order> orders = new ArrayList<>();
             if (CollectionUtils.isEmpty(topOrders)) {
                 orders.addAll(topOrders);
@@ -212,7 +208,6 @@ public class TopTradeServiceImpl implements TopTradeService {
         AutoTaskMessageInfoDTO dto = new AutoTaskMessageInfoDTO();
         // 创建对象
         BeanUtils.copyProperties(createAutoTaskMessageInfo(template, setting, sendNickList, trade, taskId), dto);
-        //TODO 调用远端接口发送
         apiSendMessageClient.taskMessageSending(dto);
 
     }
@@ -305,18 +300,17 @@ public class TopTradeServiceImpl implements TopTradeService {
             return message.getId();
         }
         Integer type = setting.getType();
-        // 若不存在，则创建一个
+        // 创建新应用
         message = new AutoTaskMessage();
-        message.setStartDt(date);
+        message.setStartDate(date);
-        message.setTaskName(AppSettingTypeEnum.valueOf(type));
+        message.setTemplate(template);
-        message.setTaksInfo(StrUtil.EMPTY);
+        message.setTaskInfo(StrUtil.EMPTY);
-        message.setIsRemark(DefaultConstants.ZERO_NUMBER);
+        message.setIsFinish(Boolean.FALSE);
-        message.setIsOver(DefaultConstants.ZERO_NUMBER);
-        message.setStatus(DefaultConstants.ZERO_NUMBER);
-        message.setType(DefaultConstants.ZERO_NUMBER);
         message.setSendType(setting.getType());
-        message.setTemplt(template);
         message.setSellerNick(setting.getSellerNick());
+        message.setStatus(DefaultConstants.ZERO_NUMBER);
+        message.setSendType(DefaultConstants.ZERO_NUMBER);
+        message.setTaskName(AppSettingTypeEnum.valueOf(type));
         return autoTaskMessageRepository.save(message).getId();
     }
 

trade-common/src/main/java/com/hchbox/base/BaseMember.java

@@ -59,7 +59,7 @@ public class BaseMember implements Serializable {
     @ApiModelProperty("交易成功数 交易成功数+关闭交易数")
     protected Integer tradeAllCount;
 
-    @Column(name = "trade_all_count")
+    @Column(name = "trade_count")
     @ApiModelProperty("交易成功笔数")
     protected Integer tradeCount;
 

trade-common/src/main/java/com/hchbox/base/BaseTrade.java

@@ -7,6 +7,7 @@ import lombok.Setter;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @author Enzo
@@ -32,4 +33,6 @@ public class BaseTrade extends Trade {
     protected Integer updateStatus;
 
 
+
+
 }

trade-common/src/main/java/com/hchbox/constant/RemindTemplates.java

@@ -62,7 +62,7 @@ public class RemindTemplates {
      *
      * @param template template
      * @param trade    trade
-     * @return
+     * @return 转换后信息
      */
     public static String prepareMsg(String template, Trade trade) {
 

trade-pojo/src/main/java/com/hchbox/enums/AppSettingTypeEnum.java

@@ -1,11 +1,8 @@
 package com.hchbox.enums;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import java.util.Optional;
-
 /**
  * @author Enzo
  * @date : 2021/7/15

trade-pojo/src/main/java/com/hchbox/enums/HistoryFiledEnum.java

@@ -1,6 +1,5 @@
 package com.hchbox.enums;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

trade-pojo/src/main/java/com/hchbox/enums/ResponseCode.java

@@ -1,7 +1,6 @@
 package com.hchbox.enums;
 
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 
 /**
  * @author q

trade-pojo/src/main/java/com/hchbox/enums/TradeEnum.java

@@ -1,6 +1,5 @@
 package com.hchbox.enums;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -26,5 +25,5 @@ public enum TradeEnum {
     TRADE_CLOSED_BY_TAO_BAO("TRADE_CLOSED_BY_TAO_BAO"),
 
     ;
-    private String stateValue;
+    private final String stateValue;
 }