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

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitConstant.java

@@ -15,14 +15,23 @@ public class RabbitConstant {
     public static final String ORDER_TOPIC = ORDER+ TOPIC_EXC;
     public static final String INTEGRAL = "integral";
     public static final String INTEGRAL_TOPIC = INTEGRAL + TOPIC_EXC;
+
     /**************************key*********************************/
+    //用户
     public static final String KEY_APPUSER_REGISTER = "appUser.register";
     public static final String KEY_APPUSER_AUTH = "appUser.auth";
+
+    //积分
     public static final String INTEGRAL_ROUTING_KEY = "integral_routing_key";
+
+    //订单
     public static final String KEY_ORDER_PAY = "order.pay";
     public static final String KEY_ORDER_FINLISH = "order.finlish";
     public static final String KEY_ORDER_CANCEL = "order.cancel";
 
+    //钱包
+    public static final String KEY_WALLET_ADD = "wallet.add";
+
     static {
         exchangeTopicSet = new HashSet<String>() {{
            add(ADMIN_TOPIC);

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserRelation.java

@@ -65,9 +65,9 @@ public class AppUserRelation implements Serializable {
 	    /**
      *  创建时间
      */
-    @Column(name = "ctr_time")
+    @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间")
-    private Long ctrTime;
+    private Long crtTime;
 	
 	    /**
      *  更新时间

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

@@ -48,7 +48,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
     private AppUserLoginBiz appUserLoginBiz;
 
 
-    public void saveUserMember(UserMemberSaveDTO userMemberSaveDTO) {
+    public void saveUserMember(UserMemberSaveDTO userMemberSaveDTO,Integer userId,String name) {
         if (userMemberSaveDTO != null) {
             UserMemberDTO userMemberDTO = new UserMemberDTO();
             BaseUserMemberLevel level = userMemberLevelBiz.getLevel(userMemberSaveDTO.getMemberLevel());
@@ -76,6 +76,8 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .rentFreeDays(userMemberSaveDTO.getRentFreeDays())
                     .discount(level == null ? 0 : level.getDiscount() == null ? 0 : level.getDiscount())
                     .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(userMemberSaveDTO.getPhone()) == null ? 0 : 1))
+                    .crtId(userId)
+                    .crtName(name)
                     .isDel(0)
                     .build();
             if (log.isDebugEnabled()) {

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

@@ -20,12 +20,16 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
     public static final String ORDER_WATER_QUEUE = "order.water.queue";
 
     public static final String ORDER_FINLISH_USER_RE_QUEUE = "order.cancel.userRe.queue";
+    //钱包50入账
+    public static final String  WALLET_ADD_QUEUE = "wallet.add.queue";
     static {
             myQueue = new ArrayList<BindDTO>(){{
             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));
             add(new BindDTO(ORDER_FINLISH_USER_RE_QUEUE,  ADMIN_TOPIC, KEY_ORDER_FINLISH));
+            //钱包
+            add(new BindDTO(WALLET_ADD_QUEUE,  ADMIN_TOPIC,KEY_WALLET_ADD ));
         }};
     }
 }

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

+package com.github.wxiaoqi.security.admin.handler;
+
+
+import cn.hutool.json.JSONUtil;
+import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+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.*;
+
+@Component
+@Slf4j
+public class WalletMQHandler {
+
+    @Autowired
+    AppUserSellingWaterBiz waterBiz;
+
+    /**
+     * 佣金
+     * @param
+     */
+    @RabbitListener(queues = WALLET_ADD_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");
+
+                    OrderMQDTO orderMQDTO = JSONUtil.toBean(msg, OrderMQDTO.class);
+
+
+                    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/rest/admin/UserMemberAdminController.java

@@ -95,9 +95,15 @@ public class UserMemberAdminController {
 
     @ApiOperation("会员新增")
     @PostMapping("/save")
-    public ObjectRestResponse<Void> saveUserMember(@RequestBody UserMemberSaveDTO userMemberSaveDTO) {
-        baseUserMemberExportBiz.saveUserMember(userMemberSaveDTO);
-        return ObjectRestResponse.succ();
+    public ObjectRestResponse<Void> saveUserMember(@RequestBody UserMemberSaveDTO userMemberSaveDTO,HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            baseUserMemberExportBiz.saveUserMember(userMemberSaveDTO,Integer.valueOf(infoFromToken.getId()),infoFromToken.getName());
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+
     }
 
     @ApiOperation("分页查询")

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -215,6 +215,7 @@ public class AppPermissionService {
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public JSONObject register(String username, String password, String headimgurl,
                                String nickname, String mobilecode, String openId, String unionid, Integer type,String code) {
+        log.info("register------code====="+code);
         String activityCode = null;
         // 判断参数和验证码
         if (StringUtils.isBlank(username) || StringUtils.isBlank(password) || StringUtils.isBlank(mobilecode)) {
@@ -279,8 +280,12 @@ public class AppPermissionService {
                 }
                 parentId=appUserDetailBiz.getUserByCode(code);
             }
-            if(parentId!=null&&parentId>0&&StringUtils.isNotBlank(activityCode)){
-                rsUserDetail.setInviterAccount(parentId);
+            if(parentId!=null&&parentId>0){
+                relationBiz.bindRelation(userid, parentId, 1);
+                if(StringUtils.isNotBlank(activityCode)){
+                    rsUserDetail.setInviterAccount(parentId);
+                }
+
             }
             //生成邀请码 长度改为8 不然重复率太高
             rsUserDetail.setCode(UUIDUtils.genCodes(8));

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppVersionController.java

@@ -51,9 +51,9 @@ public class AppVersionController extends BaseController<AppVersionBiz,AppVersio
     ){
         ObjectRestResponse restResponse=null;
          if (isH5!=null&&isH5==1){
-             restResponse= baseBiz.getVersion(version,type);
+             restResponse= baseBiz.getVersionH5(type);
          }else {
-             restResponse=baseBiz.getVersionH5(type);
+             restResponse=baseBiz.getVersion(version,type);
          }
         return restResponse;
     }