代码合并

service/trade-service-others/trade-service-others-account/src/main/java/com/hchbox/api/RequestCore.java

@@ -1,6 +1,5 @@
 package com.hchbox.api;
 
-import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
@@ -74,10 +73,11 @@ public class RequestCore {
 
     /**
      * 支付成功数据同步
+     *
      * @param payOrder
      * @return
      */
-    public CommonResult<Object> savePayOrder(PayOrder payOrder){
+    public void savePayOrder(PayOrder payOrder) {
         String reqUrl = url + API_PREFIX + "/pay/notify";
         Map<String, Object> map = new HashMap<>();
         map.put("templateId", payOrder.getTemplateId());
@@ -89,22 +89,21 @@ public class RequestCore {
         map.put("amount", payOrder.getAmount());
         map.put("nickName", payOrder.getNickName());
         map.put("masterUserId", payOrder.getMasterUserId());
-        String post = HttpUtil.post(reqUrl,JSONUtil.parseObj(map).toString());
-        return new CommonResult<>().success(post);
+        HttpUtil.post(reqUrl, JSONUtil.parseObj(map).toString());
     }
 
     /**
      * 开通账号推送服务
+     *
      * @param payOrder
      * @return
      */
-    public CommonResult<Object> updateSellerAccount(PayOrder payOrder){
+    public void updateSellerAccount(PayOrder payOrder) {
         String reqUrl = url + API_PREFIX + "/account/updateSellerAccount";
         Map<String, Object> map = new HashMap<>();
         map.put("accountBalance", payOrder.getAmount());
         map.put("id", payOrder.getMasterUserId());
-        String post = HttpUtil.post(reqUrl,JSONUtil.parseObj(map).toString());
-        return new CommonResult<>().success(post);
+        HttpUtil.post(reqUrl, JSONUtil.parseObj(map).toString());
     }
 
     private CommonResult<Object> requestApi(String url) {

service/trade-service-others/trade-service-others-account/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 8856
 spring:
   profiles:
-    active: dev
+    active: prod
   application:
     name: @artifactId@
   jpa:

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

@@ -47,56 +47,6 @@ spring:
     sharding:
       # 默认数据源
       default-data-source-name: taomi
-      #        inline: #数据库分库策略
-      #          sharding-column: id
-      #          algorithm-expression: db$->{id % 3}
-      tables:
-        # 订单表 分表：20
-        top_trade:
-          # 真实表 order_0
-          actualDataNodes: taomi.top_trade_$->{0..5}
-          keyGenerateStrategy:
-            column: id
-            keyGeneratorName: snowflake
-          # 分库策略
-          databaseStrategy:
-            none:
-          # 分表策略
-          tableStrategy:
-            inline:
-              shardingColumn: seller_nick
-              # 分片算法行表达式，需符合groovy语法 '& Integer.MAX_VALUE' 位运算使hash值为正数
-              algorithmExpression: top_trade_$->{Math.abs(seller_nick.hashCode())%5}
-        top_order:
-          # 真实表 order_0
-          actualDataNodes: taomi.top_order_$->{0..5}
-          keyGenerateStrategy:
-            column: id
-            keyGeneratorName: snowflake
-          # 分库策略
-          databaseStrategy:
-            none:
-          # 分表策略
-          tableStrategy:
-            inline:
-              shardingColumn: seller_nick
-              # 分片算法行表达式，需符合groovy语法 '& Integer.MAX_VALUE' 位运算使hash值为正数
-              algorithmExpression: top_trade_$->{Math.abs(seller_nick.hashCode())%5}
-        member:
-          # 真实表 order_0
-          actualDataNodes: taomi.member_$->{0..5}
-          keyGenerateStrategy:
-            column: id
-            keyGeneratorName: snowflake
-          # 分库策略
-          databaseStrategy:
-            none:
-          # 分表策略
-          tableStrategy:
-            inline:
-              shardingColumn: account_id
-              # 分片算法行表达式，需符合groovy语法 '& Integer.MAX_VALUE' 位运算使hash值为正数
-              algorithmExpression: member_$->{account_id % 5}
   datasource:
     dynamic:
       datasource:

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-source/trade-service-source-dao/src/main/java/com/hchbox/entity/master/PayOrder.java

@@ -1,16 +1,11 @@
 package com.hchbox.entity.master;
 
-import cn.hutool.core.date.DatePattern;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hchbox.model.entity.BasePayOrder;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @author Enzo

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

@@ -0,0 +1,11 @@
+package com.hchbox.repository.master;
+
+import com.hchbox.entity.master.PayOrder;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PayOrderRepository extends JpaRepository<PayOrder, Long>, JpaSpecificationExecutor<PayOrder> {
+
+}

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

@@ -6,12 +6,9 @@ import com.hchbox.model.param.CommonResult;
 import com.hchbox.repository.master.PayOrderRepository;
 import com.hchbox.repository.master.PayTemplateRepository;
 import com.hchbox.service.PayTemplateService;
-import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.Map;
 
 /**
  * @author wujingtao