Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -27,9 +27,15 @@ public interface UserFeign {
     public static final int MEMBER_DAYS_CONFIRM = 2;
     public static final int MEMBER_DAYS_WITHDRAW = 3;
 
+    //后台用户
     @RequestMapping(value = "/public/userinfo-by-token")
     public ObjectRestResponse<UserDTO> userinfoByToken(@RequestParam("token") String token);
 
+    @RequestMapping(value = "/public/userinfo-by-uid")
+    public ObjectRestResponse<UserDTO> userinfoByUid(@RequestParam("uid") Integer uid);
+
+
+
     /**
      * token获取用户信息
      * @param token
@@ -37,9 +43,6 @@ public interface UserFeign {
      */
     @RequestMapping(value = "/public/app/userinfo-by-token")
     public ObjectRestResponse<AppUserDTO> userDetailByToken(@RequestParam("token") String token);
-    @RequestMapping(value = "/public/userinfo-by-uid")
-    public ObjectRestResponse<UserDTO> userinfoByUid(@RequestParam("uid") Integer uid);
-
     /**
      * id获取用户信息
      * @param id

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -176,7 +176,12 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         int r = amount.compareTo(BigDecimal.ZERO);
         //更新钱包
         if (r == 1 && userId > 0) {
-            myWaterBiz.updMyWater(userId, orderId, amount);
+            MyWalletDetail detail=new MyWalletDetail();
+            detail.setUserId(userId);
+            detail.setAmount(amount);
+            detail.setCono(orderId);
+            detail.setSource(1);
+            myWaterBiz.updMyWater(detail);
         }
 
     }
@@ -209,7 +214,12 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
         int r = amount.compareTo(BigDecimal.ZERO);
         //更新钱包
         if (r == 1 && userId > 0) {
-            myWaterBiz.updMyWater(userId, orderId, amount);
+            MyWalletDetail detail=new MyWalletDetail();
+            detail.setUserId(userId);
+            detail.setAmount(amount);
+            detail.setCono(orderId);
+            detail.setSource(1);
+            myWaterBiz.updMyWater(detail);
         }
 
     }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWaterBiz.java

@@ -35,8 +35,14 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
 
 
     //我的钱包入账
-    public  void updMyWater(Integer userId, Integer orderId,BigDecimal amount){
-        log.info("---我的钱包入账----userId==="+userId+"----orderId===="+orderId+"----amount===="+amount);
+    public  void updMyWater(MyWalletDetail walletDetail){
+        if (walletDetail==null){
+            log.info("钱包入账-----参数为空");
+        }
+        Integer userId= walletDetail.getUserId();
+        BigDecimal amount= walletDetail.getAmount();
+        Integer source=walletDetail.getSource();
+        log.info("---我的钱包入账----userId==="+userId+"----source===="+source+"----amount===="+amount);
         MyWallet wallet=new MyWallet();
         wallet.setUserId(userId);
         wallet=selectOne(wallet);
@@ -70,12 +76,7 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
 
         }
         log.info("---我的钱包入账----userId==="+userId+"----balance===="+balance+"----totalAmount===="+totalAmount+"---todayAmount==="+todayAmount+"---unbooked=="+unbooked);
-        MyWalletDetail walletDetail=new MyWalletDetail();
-        walletDetail.setUserId(userId);
-        walletDetail.setSource(1);
-        walletDetail.setCono(orderId);
         walletDetail.setItype(1);
-        walletDetail.setAmount(amount);
         walletDetail.setBalance(oldBalance);
         walletDetailBiz.insertSelective(walletDetail);
         Long time=System.currentTimeMillis();

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/RabbitAdminConfig.java

@@ -22,8 +22,14 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
     public static final String ORDER_FINLISH_USER_RE_QUEUE = "order.cancel.userRe.queue";
     //钱包50入账
     public static final String  WALLET_ADD_QUEUE = "wallet.add.queue";
+
+    //支付完成后永久绑定关系
+    public static final String ORDER_RELATION_QUEUE = "order.relation.queue";
     static {
             myQueue = new ArrayList<BindDTO>(){{
+            //支付完成后永久绑定关系
+            add(new BindDTO(ORDER_RELATION_QUEUE, ADMIN_TOPIC, KEY_ORDER_PAY));
+            //拥金计算
             add(new BindDTO(ORDER_WATER_QUEUE, ADMIN_TOPIC, KEY_ORDER_PAY));
             add(new BindDTO(ORDER_WATER_QUEUE, ADMIN_TOPIC, KEY_ORDER_FINLISH));
             add(new BindDTO(ORDER_WATER_QUEUE, ADMIN_TOPIC, KEY_ORDER_CANCEL));

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/RelationMQHandler.java

+package com.github.wxiaoqi.security.admin.handler;
+
+
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.biz.AppUserRelationBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
+import com.rabbitmq.client.Channel;
+import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.amqp.support.AmqpHeaders;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.messaging.handler.annotation.Headers;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import static com.github.wxiaoqi.security.admin.config.RabbitAdminConfig.ORDER_RELATION_QUEUE;
+
+@Component
+@Slf4j
+public class RelationMQHandler {
+
+    @Autowired
+    AppUserRelationBiz relationBiz;
+
+    /**
+     * 永久关系绑定
+     * @param
+     */
+    @RabbitListener(queues = ORDER_RELATION_QUEUE)
+    public void integralHandler(Message message, @Headers Map<String, Object> headers, Channel channel) {
+        ExecutorService executorService = Executors.newCachedThreadPool();
+        executorService.execute(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String messageId = message.getMessageProperties().getMessageId();
+                    String msg = new String(message.getBody(), "UTF-8");
+                    log.info("接收到的消息-----msg===="+msg);
+                    OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
+                    Integer sign=orderMQDTO.getSign();
+                    Integer userId=orderMQDTO.getUserId();
+                    log.info("接收到的消息-----sign===="+sign+"-----userId===="+userId);
+                    relationBiz.foreverBind(userId);
+                    executorService.shutdown();
+                    Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);
+                    // 手动签收
+                    channel.basicAck(deliveryTag, false);
+                } catch (Exception e) {
+                    log.info("接收到的消息失败");
+                    try {
+                        channel.basicNack(message.getMessageProperties().getDeliveryTag(), false, false);
+                    } catch (IOException i) {
+                        i.printStackTrace();
+                    }
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WalletMQHandler.java

@@ -3,6 +3,9 @@ package com.github.wxiaoqi.security.admin.handler;
 
 import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.biz.MyWalletBiz;
+import com.github.wxiaoqi.security.admin.biz.MyWaterBiz;
+import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
 import com.rabbitmq.client.Channel;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -24,10 +27,10 @@ import static com.github.wxiaoqi.security.admin.config.RabbitAdminConfig.*;
 public class WalletMQHandler {
 
     @Autowired
-    AppUserSellingWaterBiz waterBiz;
+    MyWaterBiz waterBiz;
 
     /**
-     * 佣金
+     * 钱包入账
      * @param
      */
     @RabbitListener(queues = WALLET_ADD_QUEUE)
@@ -39,10 +42,9 @@ public class WalletMQHandler {
                 try {
                     String messageId = message.getMessageProperties().getMessageId();
                     String msg = new String(message.getBody(), "UTF-8");
-
-                    OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
-
-
+                    log.info("接收到的消息-----msg===="+msg);
+                    MyWalletDetail detail = JSONUtil.toBean(msg, MyWalletDetail.class);
+                    waterBiz.updMyWater(detail);
                     executorService.shutdown();
                     Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);
                     // 手动签收

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -29,7 +29,7 @@
         <result column="position_id" property="positionId"/>
         <result column="source" property="source"/>
         <result column="code" property="code"/>
-        <result column="invitera_ccount" property="inviterAccount"/>
+        <result column="inviter_account" property="inviterAccount"/>
         <result column="state" property="state"/>
     </resultMap>