RewardServer/src/main/java/com/zhongshu/reward/server/core/dao/InviteRecordDao.java

@@ -10,8 +10,6 @@ import com.zhongshu.reward.server.core.domain.InviteRecord;
  */
 public interface InviteRecordDao extends MongoDao<InviteRecord>, InviteRecordDaoExtend {
 
-    InviteRecord findByUserIdAndInviteUserIdAndDisable(String userId, String inviteUserId, boolean disable);
-
     boolean existsByUserId(String userId);
 
     InviteRecord findTopByUserIdOrderByCreateTime(String userId);

RewardServer/src/main/java/com/zhongshu/reward/server/core/service/WalletReceiptsService.java

@@ -5,9 +5,12 @@ import com.github.microservice.core.util.result.content.ResultState;
 import com.zhongshu.reward.client.model.wallet.WalletReceiptsModel;
 import com.zhongshu.reward.client.type.ReceiptsStatus;
 import com.zhongshu.reward.client.type.ReceiptsType;
+import com.zhongshu.reward.client.type.UserType;
+import com.zhongshu.reward.server.core.dao.InviteRecordDao;
 import com.zhongshu.reward.server.core.dao.VipUserRecordDao;
 import com.zhongshu.reward.server.core.dao.WalletDao;
 import com.zhongshu.reward.server.core.dao.WalletReceiptsDao;
+import com.zhongshu.reward.server.core.domain.InviteRecord;
 import com.zhongshu.reward.server.core.domain.VipUserRecord;
 import com.zhongshu.reward.server.core.domain.Wallet;
 import com.zhongshu.reward.server.core.domain.WalletReceipts;
@@ -47,7 +50,8 @@ public class WalletReceiptsService {
     VipUserRecordDao vipUserRecordDao;
 
     @Autowired
-    PromotionLogFeignService promotionLogFeignService;
+    InviteRecordDao inviteRecordDao;
+
 
     /**
      * 邀请返利入账
@@ -62,11 +66,11 @@ public class WalletReceiptsService {
         vipUserRecord.setOperateTime(DateUtils.timeToLong(vipUserParam.getCreateTime(), DateUtils.FORMAT_LONG));
         VipUserRecord save = vipUserRecordDao.save(vipUserRecord);
         //查询邀请关系
-        PromotionLogVo promotionLog = promotionLogFeignService.getPromotionLog(vipUserParam.getCpId());
-        if (Objects.isNull(promotionLog)){
+        InviteRecord inviteRecord = inviteRecordDao.findTopByUserIdOrderByCreateTime(vipUserParam.getCpId());
+        if (Objects.isNull(inviteRecord)){
             return;
         }
-        if(promotionLog.getUserType().equals(2)){//是否老用户
+        if(inviteRecord.getUserType().equals(UserType.OLD)){//是否老用户
             return;
         }
 
@@ -77,7 +81,7 @@ public class WalletReceiptsService {
             //订阅入账
             WalletReceipts walletReceipts = new WalletReceipts();
             //获取邀请人userid
-            String inviteId = promotionLog.getResourceId();
+            String inviteId = inviteRecord.getInviteUserId();
             Wallet wallet = walletService.getWalletByUserId(inviteId);
             walletReceipts.setWallet(wallet);
             walletReceipts.setUserId(vipUserParam.getCpId());

RewardServer/src/test/java/com/zhongshu/payment/server/ServerApplicationTests.java

@@ -1,402 +0,0 @@
-package com.zhongshu.payment.server;
-
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.json.JSONUtil;
-import com.github.microservice.auth.client.content.ResultContent;
-import com.zhongshu.payment.client.model.order.AdminSeachOrderModel;
-import com.zhongshu.payment.client.model.order.v2.*;
-import com.zhongshu.payment.client.model.payment.CreateRequestModel;
-import com.zhongshu.payment.client.model.payment.CreateResponseModel;
-import com.zhongshu.payment.client.model.payment.SubOrdersConfirmResponseModel;
-import com.zhongshu.payment.client.model.payment.withdrawals.*;
-import com.zhongshu.payment.client.model.payment.zswl.ApplyWithdrawalsModel;
-import com.zhongshu.payment.client.service.v2.OrderService2;
-import com.zhongshu.payment.client.type.Channel;
-import com.zhongshu.payment.client.type.JobFlowMap;
-import com.zhongshu.payment.client.type.OrderType;
-import com.zhongshu.payment.server.core.api.PaymentApi;
-import com.zhongshu.payment.server.core.api.PaymentApi2;
-import com.zhongshu.payment.server.core.api.WithdrawalsApi;
-import com.zhongshu.payment.server.core.config.PaymentConfig;
-import com.zhongshu.payment.server.core.dao.*;
-import com.zhongshu.payment.server.core.domain.Complex;
-import com.zhongshu.payment.server.core.domain.Goods;
-import com.zhongshu.payment.server.core.domain.PaymentBind;
-import com.zhongshu.payment.server.core.domain.PaymentInfo;
-import com.zhongshu.payment.server.core.service.v2.PaymentServerImpl2;
-import com.zhongshu.payment.server.core.timer.ComplexTimer;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.util.Assert;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-@SpringBootTest
-public class ServerApplicationTests {
-
-    private static final Logger log = LoggerFactory.getLogger(ServerApplicationTests.class);
-    @Autowired
-    Snowflake snowflake;
-
-    @Autowired
-    PaymentApi paymentApi;
-
-    @Autowired
-    WithdrawalsApi withdrawalsApi;
-
-    @Autowired
-    PaymentConfig paymentConfig;
-
-
-    @Autowired
-    PaymentServerImpl2 paymentService2;
-
-    @Autowired
-    OrderService2 orderService2;
-
-    @Autowired
-    PaymentBindDao paymentBindDao;
-
-    @Autowired
-    ApiLogDao apiLogDao;
-
-    @Autowired
-    GoodsDao goodsDao;
-
-    @Autowired
-    ComplexDao complexDao;
-
-    @Autowired
-    PaymentDao paymentDao;
-
-    @Autowired
-    Order2Dao order2Dao;
-
-    @Autowired
-    TransferDetailDao transferDetailDao;
-    @Autowired
-    private TransferDao transferDao;
-
-    @Autowired
-    ComplexTimer complexTimer;
-
-
-
-    @Test
-    public void payOrder() {
-
-        orderService2.findChannelGoods(JobFlowMap.Hotel,"");
-    }
-
-    @Test
-    public void query() {
-
-        AdminSeachOrderModel adminSeachOrderModel = new AdminSeachOrderModel();
-        adminSeachOrderModel.setPlatInter(true);
-        adminSeachOrderModel.setOrderType(OrderType.REFUNDED);
-        orderService2.adminSearch(adminSeachOrderModel);
-
-    }
-
-    @Test
-    public void create() {
-        Complex byAccesserUserId = complexDao.findByAccesser_user_id("65aa17f980f6d56f44643a1f");
-        Assert.isTrue(byAccesserUserId.isFinish(), "签约未完成");
-        String merNo = byAccesserUserId.getMer_no();
-//        String mappNo = byAccesserUserId.getMapp_info_list().get(0).getMapp_no();
-
-        GetMoneyDetailRequest getDetailRequest = new GetMoneyDetailRequest();
-        getDetailRequest.setTransMid(merNo);
-//        getDetailRequest.setMappId(mappNo);
-        GetMoneyDetailResponse moneyDetail = withdrawalsApi.getMoneyDetail(getDetailRequest);
-
-//        String quotaUse = moneyDetail.getData().get(0).getQuotaUse();
-//        CountDetail countDetail = new CountDetail();
-//        countDetail.setQuotaUse(quotaUse);
-    }
-
-
-    @Test
-    public void refund() {
-
-//        PaymentBind bind = paymentBindDao.findByEpId("Platform");
-//        PaymentInfo paymentInfo = bind.getPaymentInfo();
-//////
-//////
-//        RefundRequestModel requestModel = new RefundRequestModel();
-//        requestModel.setPlatformAmount(0L);
-//        requestModel.setRefundDesc("测试退款，未分账退款");
-//        requestModel.setRefundOrderId("42171772810695244943360");
-//        requestModel.setRefundAmount(10L);
-//        requestModel.setBillDate("2024-03-27");
-//        requestModel.setTid("PEYAH8X1");
-//        requestModel.setMerOrderId("89852017372911Y");
-//        CreateRequestModel.SubOrders subOrders = new CreateRequestModel.SubOrders();
-//        subOrders.setMid("89852015995900D");
-//        subOrders.setTotalAmount(10L);
-//
-//
-//        requestModel.setSubOrders(List.of(subOrders));
-//
-//
-//        PaymentApi2 paymentApi2 = new PaymentApi2(paymentInfo, apiLogDao);
-//        RefundResponseModel refund = paymentApi2.refund(requestModel);
-//        System.out.println(refund);
-
-        RefundParam2Model refundParam2Model = new RefundParam2Model();
-        refundParam2Model.setRefundAmount(BigDecimal.valueOf(10));
-        refundParam2Model.setBuyShopAmount(BigDecimal.valueOf(10));
-        refundParam2Model.setPlatformAmount(BigDecimal.valueOf(0));
-        refundParam2Model.setUseShopAmount(BigDecimal.valueOf(0));
-
-//        Goods goods = goodsDao.findById("6603823d85012d0d233372b2").get();
-//        paymentService2.refund(refundParam2Model, goods);
-
-        paymentService2.close("1788021041601630208", "660a534e32e63427d1a09c2a");
-
-    }
-
-    @Test
-    public void close() {
-
-
-        PaymentBind bind = paymentBindDao.findByChannel(Channel.ZhongShu);
-        PaymentInfo paymentInfo = bind.getPaymentInfo();
-        CreateRequestModel createRequestModel = new CreateRequestModel("wx.unifiedOrder");
-        createRequestModel.setExpireTime("2024-03-30 12:12:12");
-
-        createRequestModel.setMerOrderId("4217" + "22222222222222");
-        createRequestModel.setBusiOrderId("1111111111111111");
-        createRequestModel.setMid("89852017372911Y");
-        createRequestModel.setTid("PEYAH8X1");
-        createRequestModel.setTotalAmount(10L);
-        createRequestModel.setSubOpenId("oZJ7S4uer9LHDvLrIWmDQRuFtk98");
-        createRequestModel.setEmployeeNo("gonghao");
-//        createRequestModel.setNotifyUrl(paymentInfo.getNotifyUrl());
-//        createRequestModel.setReturnUrl("回调链接");
-        // 是否分账
-        createRequestModel.setDivisionFlag(false);
-        // 异步分账
-
-
-        PaymentApi2 paymentApi2 = new PaymentApi2(paymentInfo, apiLogDao);
-        CreateResponseModel responseBaseModel = paymentApi2.creatOrder(createRequestModel);
-        System.out.println(responseBaseModel);
-    }
-
-    @Test
-    public void ttt() {
-
-        AdminSeachOrderModel adminSeachOrderModel = new AdminSeachOrderModel();
-        adminSeachOrderModel.setNoOrGName("1772440085801148416");
-        adminSeachOrderModel.setShopId("");
-
-        ResultContent<Page<OrderResult2Model>> pageResultContent = orderService2.adminSearch(adminSeachOrderModel);
-
-        System.out.println(pageResultContent.getContent());
-
-    }
-
-    @Test
-    public void ttt2() {
-
-        AdminSeachOrderModel adminSeachOrderModel = new AdminSeachOrderModel();
-        adminSeachOrderModel.setOrderType(OrderType.WAIT_USE);
-        ResultContent<Page<OrderResult2Model>> pageResultContent = orderService2.adminSearch(adminSeachOrderModel);
-        System.out.println(pageResultContent);
-//        ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm("66042b98aefddc65323e187e", "6580f9b9cae1326607eaa24a");
-//        subOrdersConfirmResponseModelResultContent.getContent();
-        List<Goods> distinctByGoodsIdAndUserId = goodsDao.findByGoodsIdAndUserId("1772928077253447680", "65fe583d74d67a7dbd842b45");
-        System.out.println(distinctByGoodsIdAndUserId.size());
-
-
-    }
-
-
-    @Test
-    public void videoWithdrawals() {
-
-
-    }
-
-
-    @Test
-    public void batchQueryRequest() {
-        BatchQueryRequest batchQueryRequest = new BatchQueryRequest();
-        batchQueryRequest.setBatchNo("17453442885887262722");
-        batchQueryRequest.setTxnDate("20240417");
-        batchQueryRequest.setTransMid("89852017372912P");
-
-        BatchQueryResponse withdrawals = withdrawalsApi.batchQuery(batchQueryRequest);
-        log.info("响应：{}", JSONUtil.toJsonStr(withdrawals));
-
-    }
-
-
-    @Test
-    public void tt112t() {
-
-        ApplyWithdrawalsModel applyWithdrawalsModel = new ApplyWithdrawalsModel();
-        applyWithdrawalsModel.setPlatform(false);
-        applyWithdrawalsModel.setChannel(Channel.ZhongShu);
-        applyWithdrawalsModel.setShopId("6605627832e63427d1a08714");
-
-        paymentService2.applicationWithdrawals(applyWithdrawalsModel);
-
-        ApplyWithdrawalsModel applyWithdrawalsModel1 = new ApplyWithdrawalsModel();
-        applyWithdrawalsModel1.setPlatform(true);
-        applyWithdrawalsModel1.setChannel(Channel.ZhongShu);
-        applyWithdrawalsModel1.setShopId(Channel.ZhongShu.name());
-
-        paymentService2.applicationWithdrawals(applyWithdrawalsModel);
-
-//        for (TransferDetail transferDetail : transferDetailDao.findByShopMid("89852017372912Y")) {
-//
-//            List<Transfer> byOrderNo = transferDao.findByOrderNo(transferDetail.getOrderNo());
-//            byOrderNo.forEach(it->it.setChannel(Channel.GuiDa));
-//            transferDao.saveAll(byOrderNo);
-//        }
-
-
-    }
-
-
-    @Test
-    public void testw() {
-
-
-        WithdrawalsRequest withdrawalsRequest = new WithdrawalsRequest();
-//        withdrawalsRequest.setTotalAmt("8");
-//        withdrawalsRequest.setTotalQty("1");
-        withdrawalsRequest.setTransMid("89852017372911Y");
-        withdrawalsRequest.setBatchNo(snowflake.nextIdStr());
-        WithdrawalsRequest.Deatil deatil = new WithdrawalsRequest.Deatil();
-        deatil.setTxnNo(snowflake.nextIdStr());
-        deatil.setMerOrderId("42171773171497466568704");
-        deatil.setClearDate("20240328");
-        deatil.setMerNo("89852015995900D");
-        deatil.setMerName("宠物店");
-//        deatil.setTxnAmt("8");
-        withdrawalsRequest.setDetail(List.of(deatil));
-
-
-        WithdrawalsResponse withdrawals = withdrawalsApi.withdrawals(withdrawalsRequest);
-        System.out.println(withdrawals);
-
-
-    }
-
-
-    @Test
-    public void ttttt() {
-
-        ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm("6605b6f666f86738e91987e9", "65fe7c9174d67a7dbd842b74");
-        System.out.println(subOrdersConfirmResponseModelResultContent);
-
-    }
-
-    @Test
-    public void transferDetailDao() {
-
-        WithdrawRequestModel withdrawRequestModel = new WithdrawRequestModel();
-        withdrawRequestModel.setShopId("6605627832e63427d1a08714");
-        withdrawRequestModel.setSize(10);
-        withdrawRequestModel.setPage(0);
-
-        transferDetailDao.shopTransferDetail(withdrawRequestModel);
-        ApplyWithdrawalsModel applyWithdrawalsModel = new ApplyWithdrawalsModel();
-        applyWithdrawalsModel.setPlatform(false);
-        applyWithdrawalsModel.setChannel(Channel.ZhongShu);
-        applyWithdrawalsModel.setShopId("661e1fad30fed626f8b583f8");
-        transferDetailDao.detailAccount(applyWithdrawalsModel);
-//        transferDetailDao.acount("6605627832e63427d1a08714");
-//        transferDetailDao.withdrawOrder(withdrawRequestModel);
-    }
-
-    @Test
-    public void tee() {
-//        AdminSeachOrderModel adminSeachOrderModel = new AdminSeachOrderModel();
-//        adminSeachOrderModel.setOrderType(OrderType.APPLY_REFUND);
-//        order2Dao.findAdminOrder(adminSeachOrderModel, PageRequest.of(0, 10));
-
-//        ResultContent resultContent = paymentService2.applicationWithdrawals("PLATFORM");
-        transferDetailDao.acountDetail("6603b43c32e63427d1a07ab6");
-    }
-
-    @Test
-    public void transfer() {
-
-        ResultContent<GoodsResultModel> goodsResultModelResultContent = orderService2.goodsDetail2("1777974122433875968", "1777974122842091520");
-        System.out.println(goodsResultModelResultContent.getContent());
-
-    }
-
-    @Autowired
-    MongoTemplate mongoTemplate;
-
-    @Test
-    public void time() {
-//        goods.goodsState": "WAIT_USE", "transfer": false, "pay": true
-//
-//        Aggregation aggregation = newAggregation(
-//                Aggregation.lookup("goods", "orderNo", "orderNo", "goods"),
-//                Aggregation.match(Criteria.where("goods.validDay").ne(null).and("goods.goodsState").is("WAIT_USE").and("pay").is(true)),
-//                Aggregation.project()
-//                        .and("createTime").as("createTime")
-//                        .and("goodsId").as("goodsId")
-//                        .and("orderNo").as("orderNo")
-//                        .and("transfer").as("transfer")
-//                        .and("platform").as("platform")
-//                        .and("buyShop").as("buyShop")
-//                        .and("useShop").as("useShop")
-//                        .and("shopId").as("goods.shopId")
-//                        .andExpression("{$add: {{ $arrayElemAt: {'$goods.createTime', 0} },{ $multiply: {{ $arrayElemAt: {'$goods.validDay', 0} }, 24 * 60 * 60 * 1000} }}}").as("time"),
-//                Aggregation.match(Criteria.where("time").lte(new Date().getTime()))
-//        );
-//
-//        mongoTemplate.aggregate(aggregation, "transfer", Document.class).getMappedResults();
-
-        for (TransferModel transferModel : transferDao.validDayTimeOute()) {
-            System.out.println(transferModel);
-        }
-
-    }
-
-
-    @Test
-    public void guiDaPayment() {
-
-
-        CreateRequestModel createRequestModel = new CreateRequestModel("wx.miniPreOrder");
-        createRequestModel.setAsynDivisionFlag(true);
-        createRequestModel.setSubOpenId("1784754317116801025");
-        createRequestModel.setDivisionFlag(true);
-        createRequestModel.setMerOrderId("42171784754317116801025");
-        createRequestModel.setMid("89852017372912Y");
-        createRequestModel.setOrderDesc("文创商品");
-        createRequestModel.setPlatformAmount(0L);
-        createRequestModel.setSubOpenId("ovIOO4spgsdv4vNtrs0j3_VDkKLY");
-        CreateRequestModel.SubOrders subOrders = new CreateRequestModel.SubOrders();
-        subOrders.setMid("89852015995900D");
-        subOrders.setTotalAmount(10L);
-        createRequestModel.setSubOrders(List.of(subOrders));
-        createRequestModel.setTid("NT4RL61Q");
-        createRequestModel.setTotalAmount(10L);
-        createRequestModel.setUserId("65fe583d74d67a7dbd842b45");
-
-
-        paymentApi.creatOrder(createRequestModel);
-
-
-    }
-
-
-}

RewardServer/target/classes/application-dev.yml

@@ -1,41 +0,0 @@
-spring:
-  data:
-    mongodb:
-      #uri: mongodb://paymentcenter:paymentcenter@192.168.110.241:30117,192.168.110.241:30118,192.168.110.241:30119/paymentcenter?replicaSet=MongoSetsShard1
-      uri: mongodb://rewardcenter:rewardcenter@192.168.110.241:30117,192.168.110.241:30118,192.168.110.241:30119/rewardcenter?replicaSet=MongoSetsShard1
-      auto-index-creation: true
-  redis:
-    host: 192.168.110.241
-    port: 6379
-    database: 6
-
-swagger:
-  packageName: "com.zhongshu.reward.core.controller"
-  title: RewardServer
-  description: 返利中心
-  version: "1.0"
-  enable: true
-
-payment:
-  mer_no: 89852017372911Y
-  tid: PEYAH8X1
-  accesser_id: GZHYXHSH52011
-  key: udik876ehjde32dU61edsxsf
-  h5_page_url: https://selfapply-test.chinaums.com/self-sign-mobile/#/chooseRole
-  pc_page_url: https://selfapply-test.chinaums.com/self-sign-web/#/verify
-  interface_url: https://selfapply-test.chinaums.com/self-contract-nmrs/interface/autoReg
-#  interface_url: http://192.168.110.241:7300/mock/654babd538574f002773e5f8/dev/autoReg
-#  interface_url: https://yinshangpai.chinaums.com/self-contract-nmrs/interface/autoReg
-  pay_url: https://dhjt-uat.chinaums.com/queryService/UmsWebPayPlugins
-  pay_key: 11111111111111111111111111111111
-  withdrawals_url: https://dhjt.chinaums.com/entryService/unified-withdrawals-api
-  # 提现秘钥
-  withdrawals_key: 11111111111111111111111111111111
-  notifyUrl: https://api.dev.zonelife.cn/springbatchservice/pay/sync
-#  pay_url: https://dhjt-api.chinaums.com/queryService/UmsWebPayPlugins
-
-
-
-#knife4j:
-#debug: true
-#  production: false

RewardServer/target/classes/application.yml

@@ -1,64 +0,0 @@
-#Web?????
-server:
-  port: 9403
-
-#??????
-spring:
-  cloud:
-    consul:
-      discovery:
-        prefer-ip-address: true # ip????
-        hostname: localhost    # ??????
-        port: ${server.port}
-        health-check-path: /actuator/health  # ??????
-        health-check-interval: 10s   # ??10s??
-        register: true  # ????
-        service-name: ${spring.application.name} # ????
-        instance-id: ${spring.application.name}:${server.port}
-      host: 192.168.110.241:8500,192.168.110.241:8501,192.168.110.241:8502
-      port: 8500
-    #kafka
-    stream:
-      kafka:
-        binder:
-          brokers: 192.168.110.241:9092,192.168.110.241:9093,192.168.110.241:9094
-          replication-factor: 1
-      function:
-        definition: userLogStreamConsumer;vipUserStreamConsumer
-      bindings:
-        userLogStreamConsumer-in-0:
-          destination: UserLogStream
-          group: RewardServer
-        vipUserStreamConsumer-in-0:
-          destination: VipUserStream
-          group: RewardServer
-    bus:
-      enabled: true
-  #??zipkin???????
-  zipkin:
-    base-url: http://192.168.110.241:9411
-    enabled: true
-    sender:
-      type: web
-  sleuth:
-    sampler:
-      probability: 0.01
-
-
-
-
-wechat:
-  merchantId: 111
-  privateKey: 1212
-  merchantSerialNumber: 111
-  apiV3Key: 1111
-  appid: 1111
-  transferSceneId: 1111
-
-
-
-#????????
-logging:
-  file:
-    name: logs/RewardServer.log
-#debug: true

RewardServer/target/classes/bootstrap.yml

@@ -1,23 +0,0 @@
-###需拷贝到每一个模块下
-
-spring:
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-  main: #允许循环引用
-    allow-circular-references: true
-  # 应用名
-  application:
-    name: RewardServer
-  # 当前读取配置文件的类型
-  profiles:
-    active: dev
-  #配置中心
-  cloud:
-    config:
-      uri: http://192.168.110.241:8000
-      name: RewardServer,ConfigCenter
-  autoconfigure:
-    exclude:
-      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-      - org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration