Merge remote-tracking branch 'origin/v1.7' into dev

application-webadmin/src/main/java/com/tourism/webadmin/app/website/controller/LoginToWebsiteController.java

@@ -319,6 +319,7 @@ public class LoginToWebsiteController {
             tourUser.setMobile(loginMoblie);
             tourUser.setCountryCode(StringUtils.isBlank(countryCode)? "86" : countryCode);
             tourUser.setPassword(passwordEncoder.encode("123456"));
+            tourUser.setHeadImageUrl(appConfig+"/default_profile/defaultAvatar.png");
             //创建用户，给出默认头像和默认昵称
             tourUser.setShowName("逍遥游用户_" + RandomUtil.randomString(6));
             tourUser = tourUserService.saveNew(tourUser);

application-webadmin/src/main/java/com/tourism/webadmin/back/controller/TourOrderController.java

@@ -165,7 +165,9 @@ public class TourOrderController {
         String orderBy = MyOrderParam.buildOrderBy(orderParam, TourOrder.class);
         List<TourOrder> tourOrderList = tourOrderService.getTourOrderListWithRelation(tourOrderFilter, orderBy);
         for(TourOrder item:tourOrderList){
-            item.setRebateSumPrice(tourOrderService.getTourUserRebate(item.getCreateUserId(),item.getGroupPurchaseProgressId()));
+            item.setRebateSumPrice(tourOrderService.getTourUserRebate(
+                    item.getCreateUserId(),item.getGroupPurchaseProgressId()) == null?
+                    BigDecimal.ZERO:tourOrderService.getTourUserRebate(item.getCreateUserId(),item.getGroupPurchaseProgressId()));
         }
          return ResponseResult.success(MyPageUtil.makeResponseData(tourOrderList, TourOrderVo.class));
     }