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

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

@@ -316,8 +316,8 @@ public class AppPermissionService {
             }*/
             //临时会员绑定
             insertUserMemberByUserIdAndPhone(userid, username);
-            /*//参加新人活动
-            jionActivity(userid);*/
+            //参加新人活动
+            jionActivity(userid);
             //创建钱包
             walletBiz.createWalletByUserId(appUserLogin.getId());
             // 登录结果要做做统一处理
@@ -950,8 +950,8 @@ public class AppPermissionService {
             relationBiz.bindByUserId(userid, small_id);
             //发送短信通知用户
             thirdFeign.sendCode(username, password, SystemConfig.TEMPLATECODE);
-           /* //参加新人活动
-            jionActivity(userid);*/
+           //参加新人活动
+            jionActivity(userid);
             // 登录结果要做做统一处理
             JSONObject data = autoLogin(userid, username, headimgurl, nickname,null,null,2);
             // 到im注册，获取返回结果

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -251,6 +251,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getDedDetail())) {
             JSONArray jsonArray = JSONArray.parseArray(orderVehicleCrosstownDto.getDedDetail());
             if(jsonArray != null && jsonArray.size() > 0) {
+                orderVehicleCrosstownDto.setDeduction(true);
                 for (int i = 0; i < jsonArray.size(); i++) {
                     JSONObject jsonObject = JSONObject.parseObject(jsonArray.get(i).toString());
                     if (jsonObject != null) {