修改钱包

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

@@ -19,7 +19,12 @@ import lombok.Data;
 @Table(name = "my_wallet_detail")
 public class MyWalletDetail implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
+
+	public static final int TYPE_POPULARIZE = 1;
+
+	public static final int SOURCE_ACTIVITY = 0;
+
+	public static final int ITYPE_IN = 0;
 	    /**
     *  主键ID
    */

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

@@ -35,7 +35,7 @@ public class RabbitAdminConfig extends RabbitCommonConfig {
             add(new BindDTO(ORDER_WATER_QUEUE, ORDER_TOPIC, KEY_ORDER_CANCEL));
             add(new BindDTO(ORDER_FINLISH_USER_RE_QUEUE,  ORDER_TOPIC, KEY_ORDER_FINLISH));
             //钱包
-            add(new BindDTO(WALLET_ADD_QUEUE,  ADMIN_TOPIC,KEY_WALLET_ADD ));
+            add(new BindDTO(WALLET_ADD_QUEUE,  ADMIN_TOPIC, KEY_WALLET_ADD));
         }};
     }
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java

 package com.xxfc.platform.activity.biz;
 
+import cn.hutool.json.JSONUtil;
 import com.github.wxiaoqi.security.admin.dto.RegisterQueueDTO;
+import com.github.wxiaoqi.security.admin.entity.MyWalletDetail;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.xxfc.platform.activity.entity.ActivityPopularizeLog;
 import com.xxfc.platform.activity.entity.ActivityPopularizeRelation;
 import com.xxfc.platform.activity.entity.ActivityPopularizeUser;
+import com.xxfc.platform.universal.feign.MQSenderFeign;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -13,6 +18,8 @@ import com.xxfc.platform.activity.entity.ActivityPopularize;
 import com.xxfc.platform.activity.mapper.ActivityPopularizeMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import java.math.BigDecimal;
+
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 
@@ -41,10 +48,15 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
     @Autowired
     UserFeign userFeign;
 
+    @Autowired
+    MQSenderFeign mqSenderFeign;
+
     public static final String POPULARIZE_0101 = "0101";
 
     public static final String PREFIX = "P";
 
+    public static final Integer INVITE_ITEMID = 3;
+
     public void handleRegister(RegisterQueueDTO registerQueueDTO) {
 
         String activityCode = registerQueueDTO.getInParamDTO().getActivityCode().replace(PREFIX, "");
@@ -70,13 +82,13 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
 
             ActivityPopularizeLog popularizeLog = popularizeLogBiz.selectOne(new ActivityPopularizeLog(){{
                 setUserId(majorUserId);
-                setItemId(3);
+                setItemId(INVITE_ITEMID);
             }});
 
             //生成任务项
             if(null == popularizeLog){
                 popularizeLogBiz.insertSelectiveRe(new ActivityPopularizeLog(){{
-                    setItemId(3);
+                    setItemId(INVITE_ITEMID);
                     setUserId(majorUserId);
                     setStatus(SYS_FALSE);
                     setPopularizeId(activityPopularize.getId());
@@ -100,6 +112,15 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper,Acti
                     popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
                     popularizeLog.setStatus(SYS_TRUE);
                     popularizeLogBiz.updateSelectiveById(popularizeLog);
+                    mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, RabbitConstant.KEY_WALLET_ADD, JSONUtil.toJsonStr(new MyWalletDetail(){{
+                        setAmount(new BigDecimal("50"));
+                        setSource(SOURCE_ACTIVITY);
+                        setUserId(appUserDTO.getUserid());
+                        setActivityId(activityPopularize.getId());
+                        setActivityName(activityPopularize.getName());
+                        setType(TYPE_POPULARIZE);
+                        setItype(ITYPE_IN);
+                    }}));
                 }
             }
         }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -338,7 +338,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rentVehicleBookDTO.setLiftCompany(detail.getStartCompanyId());
         rentVehicleBookDTO.setLiftAddr(detail.getStartAddr());
         ObjectRestResponse<VehicleBookRecord> orr = vehicleFeign.rentApplyVehicle(rentVehicleBookDTO);
-        if(! CommonConstants.SYS_JSON_TRUE.equals(orr.getStatus())) {
+        if(!CommonConstants.SYS_JSON_TRUE.equals(orr.getStatus())) {
             throw new BaseException(orr.getMessage(), orr.getStatus());
         }
         detail.setVehicleId(orr.getData().getVehicleId());