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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -79,7 +79,7 @@ public class AppUserDTO {
 	private Integer buyCount;
 	private Integer lockDays;
 	private Integer discount;
-	private Integer memberLevel;
+	private Integer memberLevel = 0;
 	private String memberName;
 	//图标
 	private String icon;

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

@@ -30,6 +30,7 @@ import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.im.feign.ImFeign;
 import com.xxfc.platform.universal.dto.RegionDTO;
+import com.xxfc.platform.universal.dto.SmsTemplateDTO;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.RegionFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
@@ -37,6 +38,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -105,6 +107,9 @@ public class AppPermissionService {
     @Autowired
     private BaseUserMemberBiz baseUserMemberBiz;
 
+    @Value("${admin.smallName}")
+    private  String  smallName;
+
 
     public AppUserInfo validate(String username, String password) {
         AppUserInfo info = new AppUserInfo();
@@ -955,7 +960,15 @@ public class AppPermissionService {
             //上线绑定
             relationBiz.bindByUserId(userid, small_id);
             //发送短信通知用户
-            thirdFeign.sendCode(username, password, SystemConfig.TEMPLATECODE);
+            List<String> smsParams = new ArrayList<String>();
+            smsParams.add(smallName);
+            smsParams.add(username);
+            smsParams.add(password);
+            thirdFeign.sendTemplate(new SmsTemplateDTO(){{
+                setPhoneNumbers(username);
+                setType(SmsTemplateDTO.PWD);
+                setParams(smsParams.toArray(new String[smsParams.size()]));
+            }});
            //参加新人活动
             jionActivity(userid);
             // 登录结果要做做统一处理

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/inter/OrderDetail.java

 package com.xxfc.platform.order.entity.inter;
 
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderItem;
@@ -28,4 +29,8 @@ public interface OrderDetail extends OrderItemInter {
 
     void setTickerNo(List<String> tickerNo);
 
+    public AppUserDTO getAppUserDTO();
+
+    public void setAppUserDTO(AppUserDTO appUserDTO);
+
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/MemberBO.java

@@ -19,6 +19,7 @@ import java.util.List;
 public class MemberBO extends OrderMemberDetail implements OrderDetail {
     private BaseOrder order;
     private BaseUserMemberLevel baseUserMemberLevel;
+    AppUserDTO appUserDTO;
     /**
      * 下单来源，1--app；2--小程序
      */

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/AddMemberDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddMemberDTO.java

-package com.xxfc.platform.order.pojo;
+package com.xxfc.platform.order.pojo.order.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
 import java.time.format.DateTimeFormatter;
 
 @Data

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/AddOrderCommonDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddOrderCommonDTO.java

-package com.xxfc.platform.order.pojo;
+package com.xxfc.platform.order.pojo.order.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/AddRentVehicleDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddRentVehicleDTO.java

-package com.xxfc.platform.order.pojo;
+package com.xxfc.platform.order.pojo.order.add;
 
-import com.xxfc.platform.activity.entity.ActivityPopularizeItem;
-import com.xxfc.platform.vehicle.constant.AccompanyingItemType;
-import com.xxfc.platform.vehicle.entity.AccompanyingItem;
+import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/AddTourDTO.java → xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddTourDTO.java

-package com.xxfc.platform.order.pojo;
+package com.xxfc.platform.order.pojo.order.add;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Column;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 
 @Data

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/BgAddRentDTO.java

+package com.xxfc.platform.order.pojo.order.add;
+
+import lombok.Data;
+
+@Data
+public class BgAddRentDTO extends AddRentVehicleDTO {
+
+    /**
+     * 用户订单
+     */
+    Integer appUserId;
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -37,7 +37,6 @@ import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
-import com.xxfc.platform.vehicle.pojo.QueryMultiDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
@@ -49,14 +48,13 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.lang.reflect.Array;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.xxfc.platform.order.pojo.AddRentVehicleDTO.DEFAULT_DATE_TIME_FORMATTER;
+import static com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO.DEFAULT_DATE_TIME_FORMATTER;
 
 @Controller
 @RequestMapping("baseOrder")

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderMemberController.java

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -9,15 +8,12 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderMemberDetail;
-import com.xxfc.platform.order.pojo.AddMemberDTO;
-import com.xxfc.platform.order.pojo.AddTourDTO;
+import com.xxfc.platform.order.pojo.order.add.AddMemberDTO;
 import com.xxfc.platform.order.pojo.order.MemberBO;
-import com.xxfc.platform.order.pojo.order.TourBO;
 import com.xxfc.platform.order.service.OrderMemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java

@@ -13,8 +13,9 @@ import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.pojo.AddRentVehicleDTO;
+import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
+import com.xxfc.platform.order.pojo.order.add.BgAddRentDTO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
@@ -59,45 +60,61 @@ public class OrderRentVehicleController extends CommonBaseController {
         @ResponseBody
         @ApiOperation(value = "确认租车订单")
         public ObjectRestResponse<BaseOrder> add(@RequestBody AddRentVehicleDTO vo){
-            if(null == vo.getEndCompanyId() || vo.getEndCompanyId().equals(0)) {
-                if(StrUtil.isBlank(vo.getEndAddr())) {
-                        throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("公司参数不正确"));
-                }else {
-                        Map<String, Object> map = BeanUtil.beanToMap(new BranchCompany(){{
-                                setName(vo.getEndAddr());
-                        }}, false, true);
-                        List<BranchCompany> data = vehicleFeign.branchCompanyEntityList(map).getData();
-                        if(null == data) {
-                                throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("公司参数不正确"));
-                        }else {
-                                BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
-                                vo.setEndCompanyId(endCompany.getId());
+            RentVehicleBO bo = initRentVehicleBO(vo);
+            bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
+            orderRentVehicleService.createOrder(bo);
+            return ObjectRestResponse.succ(bo.getOrder());
+        }
+
+        @RequestMapping(value = "back-stage/add",method = RequestMethod.POST)
+        @ResponseBody
+        @ApiOperation(value = "后台人员为客户下租车订单")
+        public ObjectRestResponse<BaseOrder> backStagedd(@RequestBody BgAddRentDTO dto){
+                RentVehicleBO bo = initRentVehicleBO(dto);
+
+                bo.setAppUserDTO(userFeign.userDetailById(dto.getAppUserId()).getData());
+                orderRentVehicleService.createOrder(bo);
+                return ObjectRestResponse.succ(bo.getOrder());
+        }
+
+        private RentVehicleBO initRentVehicleBO(@RequestBody AddRentVehicleDTO vo) {
+                if(null == vo.getEndCompanyId() || vo.getEndCompanyId().equals(0)) {
+                    if(StrUtil.isBlank(vo.getEndAddr())) {
+                            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("公司参数不正确"));
+                    }else {
+                            Map<String, Object> map = BeanUtil.beanToMap(new BranchCompany(){{
+                                    setName(vo.getEndAddr());
+                            }}, false, true);
+                            List<BranchCompany> data = vehicleFeign.branchCompanyEntityList(map).getData();
+                            if(null == data) {
+                                    throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("公司参数不正确"));
+                            }else {
+                                    BranchCompany endCompany = vehicleFeign.branchCompanyEntityList(map).getData().get(0);
+                                    vo.setEndCompanyId(endCompany.getId());
+                            }
+                    }
+                }
+                if(vo.getStartCompanyId() != null) {
+                        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData();
+                        if(companyDetail != null) {
+                                vo.setStartAddr(companyDetail.detailAddr());
                         }
                 }
-            }
-            if(vo.getStartCompanyId() != null) {
-                    CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getStartCompanyId()).getData();
-                    if(companyDetail != null) {
-                            vo.setStartAddr(companyDetail.detailAddr());
-                    }
-            }
                 if(vo.getEndCompanyId() != null) {
                         CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(vo.getEndCompanyId()).getData();
                         if(companyDetail != null) {
                                 vo.setEndAddr(companyDetail.detailAddr());
                         }
                 }
-            RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
-            bo.setBookVehicleVO(new BookVehicleVO(){{
-                    setBookStartDate(vo.getBookStartDate());
-                    setBookEndDate(vo.getBookEndDate());
-            }});
-            bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
-            bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())?
-                    StrUtil.splitTrim(vo.getTickerNos(), ","):null);
-            bo.setAccompanyItems(vo.getAccompanyItems());
-            orderRentVehicleService.createOrder(bo);
-            return ObjectRestResponse.succ(bo.getOrder());
+                RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
+                bo.setBookVehicleVO(new BookVehicleVO(){{
+                        setBookStartDate(vo.getBookStartDate());
+                        setBookEndDate(vo.getBookEndDate());
+                }});
+                bo.setTickerNo(StrUtil.isNotBlank(vo.getTickerNos())?
+                        StrUtil.splitTrim(vo.getTickerNos(), ","):null);
+                bo.setAccompanyItems(vo.getAccompanyItems());
+                return bo;
         }
 
         @RequestMapping(value = "list-by-order/{orderId}",method = RequestMethod.GET)

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderTourController.java

@@ -12,7 +12,7 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderTourDetailBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderTourDetail;
-import com.xxfc.platform.order.pojo.AddTourDTO;
+import com.xxfc.platform.order.pojo.order.add.AddTourDTO;
 import com.xxfc.platform.order.pojo.order.TourBO;
 import com.xxfc.platform.order.pojo.price.TourPriceVO;
 import com.xxfc.platform.order.service.OrderTourService;

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

@@ -64,7 +64,7 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
      * 创建基础订单
      * @return
      */
-    public BaseOrder createBaseOrder(Integer orderOrigin) {
+    public BaseOrder createBaseOrder(Integer orderOrigin, Integer appUserId) {
         BaseOrder baseOrder = new BaseOrder();
 
         //设置下单来源
@@ -85,13 +85,14 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         baseOrder.setVersion(VERSION_INITIAL);
 
         //设置用户id
-        baseOrder.setUserId(Integer.valueOf(BaseContextHandler.getUserID()));
+        baseOrder.setUserId(appUserId);
         baseOrder.setMemberLevel(getAppUser().getMemberLevel());
         return baseOrder;
     }
 
     public void initDetail(Detail detail) {
-        BaseOrder order = createBaseOrder(detail.getOrderOrigin());
+        Integer appUserId = (null == detail.getAppUserDTO())? Integer.valueOf(BaseContextHandler.getUserID()): detail.getAppUserDTO().getUserid();
+        BaseOrder order = createBaseOrder(detail.getOrderOrigin(), appUserId);
         detail.setOrder(order);
     }
 

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

@@ -261,11 +261,15 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             //计算车辆费用
 
         //如果用户存在，并且为会员，并且车辆有优惠价
+        //默认折扣默认100
+        detail.setRebate(100);
         if(null != dto && SYS_TRUE.equals(dto.getIsMember()) && !NONE.getCode().equals(dto.getMemberLevel()) && !DISCOUNT_STATUS_NONE.equals(vehicleModel.getRentDiscountStatus())) {
             String[] prices = StrUtil.isBlank(vehicleModel.getRentDiscountPrice())
                     ?new String[]{vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString(),vehicleModel.getPrice().toString()}
                     :vehicleModel.getRentDiscountPrice().split(",");
             HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
+            handleDiscountDTO.setRebate(100);
+            handleDiscountDTO.setModelAmount(vehicleModel.getPrice());
             switch (MemberEnum.getByCode(dto.getMemberLevel())) {
                 case NORMAL:
                     handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, NORMAL);
@@ -279,6 +283,8 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
                     handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, DIAMOND);
                     detail.getOrder().setHasMemberRight(SYS_TRUE);
                     break;
+                default:
+                    break;
             }
             detail.setRebate(handleDiscountDTO.getRebate());
             vehicleOrderItem.setUnitPrice(handleDiscountDTO.getModelAmount());

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/dto/SmsTemplateDTO.java

@@ -71,6 +71,8 @@ public class SmsTemplateDTO {
     public static final int PAY_I= 26;
     //旅游（上车通知）27
     public static final int PAY_J= 27;
+    //小程序密码通知
+    public static final int PWD= 28;
 
 
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/AliYunSmsBiz.java

@@ -82,6 +82,9 @@ public class AliYunSmsBiz {
     //旅游（上车通知）27
     public static final String TEMPLATE_ID_PAY_J= "SMS_173345606";
 
+    //旅游（上车通知）27
+    public static final String PWD= "SMS_174990497";
+
 
 
     //发送模板消息
@@ -166,6 +169,9 @@ public class AliYunSmsBiz {
              case 27 :
                  SmsService.sendTemplateToJson(phoneNumbers,params,TEMPLATE_ID_PAY_J);
                  break;
+             case 28 :
+                 SmsService.sendTemplateToJson(phoneNumbers,params,PWD);
+                 break;
 
          }