Merge remote-tracking branch 'origin/dev' into dev

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

@@ -194,7 +194,7 @@ public class AppPermissionService {
         }
         // String sms = PassportUtil.SendSMS(phone, SystemConfig.SENDSMS_TITLE);
         String mobilecode = null;
-        JSONObject data = thirdFeign.send(phone);
+        JSONObject data = thirdFeign.send("13265487972");
         if (data != null && data.getInteger("status") == ResultCode.SUCCESS_CODE) {
             mobilecode = data.getString("data");
         }

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

@@ -99,19 +99,19 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                     //新增第几个邀请人和邀请金额字段
                     Integer num = relationBiz.getByUserIdAndPopularizeId(activityPopularizeRelation);
 
-                    Integer amount = 0;
+                    double amount = 0;
                     JSONObject jsonObject = JSONObject.parseObject(activityPopularizeItem.getDetail());
                     if (jsonObject != null && StringUtils.isNotBlank(jsonObject.getString("detail"))) {
                         JSONArray jsonArray = JSONArray.parseArray(jsonObject.getString("detail"));
                         if (jsonArray != null) {
                             JSONObject jsonObject1 = jsonArray.getJSONObject(num - 1);
                             if (jsonObject1 != null) {
-                                Integer amountString = jsonObject1.getInteger("amount");
+                                double amountString = jsonObject1.getInteger("amount");
                                 amount = amount + amountString;
                             }
                         }
                     }
-                    Integer a = amount;
+                    double a = amount;
                     //添加活动关系
                     relationBiz.insertSelective(new ActivityPopularizeRelation() {{
                         setPopularizeId(activityPopularize.getId());
@@ -150,7 +150,7 @@ public class ActivityPopularizeBiz extends BaseBiz<ActivityPopularizeMapper, Act
                     activityPopularizeUser.setCurrentProgress(bigDecimal);
                     popularizeUserBiz.updateSelectiveById(activityPopularizeUser);
                     //任务没有完成
-                    if (!SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
+                    if (SYS_TRUE.equals(activityPopularizeUser.getStatus())) {
 //                AwardDTO awardDTO = JSONUtil.toBean(activityPopularize.getValue(), AwardDTO.class);
                         //检查是否满足奖励
                         if (relationBiz.selectList(new ActivityPopularizeRelation() {{

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleDepartureController.java

 package com.xxfc.platform.vehicle.rest;
 
-import com.alibaba.fastjson.JSONArray;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
@@ -172,7 +171,7 @@ public class VehicleDepartureController {
     public ObjectRestResponse<OrderPageVO> getOrderDetail() {
         Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
         String reserveType = dictionaryMap.get(VEHICE_ORDER + "_" + RESERVE).getDetail();
-        return ObjectRestResponse.succ(JSONArray.parse(reserveType));
+        return ObjectRestResponse.succ(reserveType);
     }