Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/msg/ObjectRestResponse.java

 package com.github.wxiaoqi.security.common.msg;
 
 import com.github.wxiaoqi.security.common.constant.RestCode;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.SystemProperty;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 
@@ -72,11 +73,11 @@ public class ObjectRestResponse<T> extends BaseResponse {
      * @return
      */
     public static ObjectRestResponse createFailedResultMsg(Integer code) {
-        return new ObjectRestResponse().status(code).msg(SystemProperty.getResultConfig(code + "")).rel(false);
+        return new ObjectRestResponse().status(code).msg(ResultCode.getMsg(code)).rel(false);
     }
 
     public static ObjectRestResponse paramIsEmpty() {
-        return ObjectRestResponse.createFailedResult(502, ObjectRestResponse.PARAM_IS_EMPTY);
+        return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, ResultCode.getMsg(ResultCode.NULL_CODE));
     }
 
     /**

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

@@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * ${DESCRIPTION}
@@ -95,5 +96,8 @@ public interface UserFeign {
             @RequestParam(value = "type",defaultValue = "1")Integer type
     );
 
+    @GetMapping("/member/entityList")
+    public ObjectRestResponse<List<BaseUserMemberLevel>> memberEntityList(@RequestParam("entity") Map<String, Object> entity);
+
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberLevelController.java

@@ -2,7 +2,9 @@ package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.UserMemberLevelBiz;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -17,7 +19,8 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("member")
-public class MemberLevelController {
+@IgnoreClientToken
+public class MemberLevelController extends BaseController<UserMemberLevelBiz, BaseUserMemberLevel> {
 
     @Autowired
     private UserMemberLevelBiz memberBiz;

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

@@ -75,4 +75,11 @@ public class OrderMemberDetail implements Serializable {
 	@Column(name = "member_level")
 	@ApiModelProperty(value = "会员等级")
 	private Integer memberLevel;
+
+	/**
+	 *  会员等级id
+	 */
+	@Column(name = "member_level_id")
+	@ApiModelProperty(value = "会员等级id")
+	private Integer memberLevelId;
 }

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

+package com.xxfc.platform.order.pojo;
+
+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
+public class AddMemberDTO {
+    public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    @ApiModelProperty(value = "会员等级id")
+    private Integer memberLevelId;
+
+    @ApiModelProperty(value = "会员等级")
+    private Integer memberLevel;
+
+    /**
+     * 优惠券ids
+     */
+    @ApiModelProperty(value = "优惠券ids")
+    private String couponIds;
+}

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

@@ -18,7 +18,6 @@ import java.util.List;
 public class MemberBO extends OrderMemberDetail implements OrderDetail {
     private BaseOrder order;
     private BaseUserMemberLevel baseUserMemberLevel;
-
     /**
      * 优惠券*
      */

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/config/WebConfiguration.java

@@ -55,7 +55,8 @@ public class WebConfiguration implements WebMvcConfigurer {
         String[] urls = {
                 "/orderRentVehicle/**",
                 "/baseOrder/**",
-                "/orderTour/**"
+                "/orderTour/**",
+                "/orderMember/**"
         };
         Collections.addAll(list, urls);
         return list;

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;
+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.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;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+@RequestMapping("orderMember")
+@Api(value="会员订单",tags={"会员订单"})
+@IgnoreClientToken
+public class OrderMemberController extends BaseController<OrderMemberDetailBiz,OrderMemberDetail> {
+
+    @Autowired
+    OrderMemberService orderMemberService;
+
+    @Autowired
+    UserFeign userFeign;
+
+    @RequestMapping(value = "add",method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "确认会员订单")
+    public ObjectRestResponse<BaseOrder> add(@RequestBody AddMemberDTO dto){
+        MemberBO bo = BeanUtil.toBean(dto, MemberBO.class);
+
+        //查询会员等级实体
+//        bo.setBaseUserMemberLevel(userFeign.memberEntityList(BeanUtil.beanToMap(new BaseUserMemberLevel(){{
+//            setId(dto.getMemberLevelId());
+//        }})).getData().get(0));
+
+//        bo.setMemberLevelId(bo.getBaseUserMemberLevel().getId());
+
+        //查询优惠券
+        orderMemberService.createOrder(bo);
+        return ObjectRestResponse.succ(bo.getOrder());
+    }
+
+}
\ No newline at end of file

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

-package com.xxfc.platform.order.rest;
-
-import com.github.wxiaoqi.security.common.rest.BaseController;
-import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
-import com.xxfc.platform.order.entity.OrderMemberDetail;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-@RequestMapping("orderMemberDetail")
-public class OrderMemberDetailController extends BaseController<OrderMemberDetailBiz,OrderMemberDetail> {
-
-}
\ No newline at end of file

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

@@ -5,6 +5,8 @@ import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.biz.OrderTemplateBiz;
@@ -21,6 +23,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.util.HashMap;
 
 @Service
 @Log4j
@@ -65,6 +68,11 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
     public void initDetail(MemberBO bo) {
         super.initDetail(bo);
         BaseUserMemberLevel buml = userFeign.level(bo.getMemberLevel());
+        if(!bo.getMemberLevelId().equals(buml.getId())) {
+            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, new HashMap<String, Object>(){{
+                put("MemberLevelId 和 MemberLevel", "不对称");
+            }});
+        }
         bo.setBaseUserMemberLevel(buml);
         bo.setRentFreeNum(buml.getNumber());
         bo.setRebate(buml.getDiscount());

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

@@ -20,6 +20,8 @@ import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderTemplate;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
+import com.xxfc.platform.universal.entity.Dictionary;
+import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
@@ -38,8 +40,8 @@ import static com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum.*;
 @Log4j
 public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicleBiz, RentVehicleBO> {
 
-    private static BigDecimal DRIVER_PRICE = new BigDecimal("600.00");
-    private static BigDecimal DAMAGE_SAFE = new BigDecimal("100.00"); //车损免赔
+    private static BigDecimal DRIVER_PRICE;
+    private static BigDecimal DAMAGE_SAFE;
     private static Integer DRIVER_TYPE_COMPANY = 1;
     private static Integer DRIVER_TYPE_DAMAGE_SAFE = 1;
     private static Integer DISCOUNT_STATUS_NONE = 0;
@@ -58,6 +60,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     @Autowired
     UserFeign userFeign;
 
+    @Autowired
+    ThirdFeign thirdFeign;
+
     @PostConstruct
     public void init(){
         this.orderTypeEnum = OrderTypeEnum.RentVehicle;
@@ -67,10 +72,25 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     @Override
     public void initDetail(RentVehicleBO bo) {
         super.initDetail(bo);
+        initDictionary();
         VehicleModel vehicleModel = vehicleFeign.get(bo.getModelId()).getData();
         bo.setVehicleModel(vehicleModel);
     }
 
+    private void initDictionary() {
+        Dictionary driverPriceDic = thirdFeign.dictionaryGet(BeanUtil.beanToMap(new Dictionary(){{
+            setType("APP_ORDER");
+            setCode("DRIVER_PRICE");
+        }}, false, true)).getData().get(0);
+
+        Dictionary damageSafeDic = thirdFeign.dictionaryGet(BeanUtil.beanToMap(new Dictionary(){{
+            setType("APP_ORDER");
+            setCode("DAMAGE_SAFE");
+        }}, false, true)).getData().get(0);
+        this.DRIVER_PRICE = new BigDecimal(driverPriceDic.getDetail());
+        this.DAMAGE_SAFE = new BigDecimal(damageSafeDic.getDetail());
+    }
+
     @Override
     public void handleDetail(RentVehicleBO bo) {
         //获取可用车辆

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/feign/ThirdFeign.java

@@ -2,14 +2,20 @@ package com.xxfc.platform.universal.feign;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.entity.OrderRefund;
 import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.universal.vo.OrderRefundVo;
 import com.xxfc.platform.universal.vo.TrafficViolations;
+import feign.Param;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+import java.util.Map;
+
 
 /**
  * ${DESCRIPTION}
@@ -49,4 +55,15 @@ public interface ThirdFeign {
     @GetMapping("/LicensePlateType")
     ObjectRestResponse getLicensePlateType();
 
+
+    /*****************************************  数据字典 ********************************************/
+
+
+//    @GetMapping(value = "/dictionary/getParents")
+    @RequestMapping(value = "/dictionary/getParents", method = RequestMethod.GET)
+    public ObjectRestResponse<List<Dictionary>> dictionaryGetParent(@RequestParam String type);
+
+//    @GetMapping(value = "/dictionary/get")
+    @RequestMapping(value = "/dictionary/get", method = RequestMethod.GET)
+    public ObjectRestResponse<List<Dictionary>> dictionaryGet(@RequestParam Map<String, Object> dictionary);
 }

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

@@ -43,7 +43,7 @@ public class DictionaryBiz extends BaseBiz<DictionaryMapper, Dictionary> {
         return ObjectRestResponse.succ();
     }
 
-    public ObjectRestResponse get(Dictionary dictionary) {
+    public ObjectRestResponse<List<Dictionary>> get(Dictionary dictionary) {
         if(dictionary == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
@@ -79,7 +79,7 @@ public class DictionaryBiz extends BaseBiz<DictionaryMapper, Dictionary> {
         return ObjectRestResponse.succ();
     }
 
-    public ObjectRestResponse getParent(String type) {
+    public ObjectRestResponse<List<Dictionary>> getParent(String type) {
         if(StringUtils.isEmpty(type)) {
             return ObjectRestResponse.paramIsEmpty();
         }

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

@@ -48,6 +48,18 @@ public class OrderRefundBiz extends BaseBiz<OrderRefundMapper,OrderRefund> {
         String partnerKey=SystemConfig.APP_PARTNER_KEY;
         Integer payAmount=orderRefundVo.getAmount();
         Integer refundAmount=orderRefundVo.getRefundAmount();
+
+        //临时处理
+        payAmount = payAmount/100000;
+        if(payAmount <= 0) {
+            payAmount = 1;
+        }
+
+        refundAmount = refundAmount/100000;
+        if(refundAmount <= 0) {
+            refundAmount = 1;
+        }
+
         String refundDesc =StringUtils.isNotBlank(orderRefundVo.getRefundDesc())?orderRefundVo.getRefundDesc(): "审核通过，退款";
         String out_refund_no = Snowflake.build() + "";
         if(StringUtils.isBlank(order_no)||StringUtils.isBlank(appid)||StringUtils.isBlank(mchId)||StringUtils.isBlank(partnerKey)

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/DictionaryController.java

@@ -8,6 +8,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping(value = "dictionary")
 @Api(value = "数据字典")
@@ -18,13 +20,13 @@ public class DictionaryController {
 
     @PostMapping(value = "/add")
     @ApiOperation(value = "添加数据")
-    public ObjectRestResponse<?> add(@RequestBody Dictionary dictionary) {
+    public ObjectRestResponse add(@RequestBody Dictionary dictionary) {
         return dictionaryBiz.add(dictionary);
     }
 
     @GetMapping(value = "/get")
     @ApiOperation(value = "获取数据")
-    public ObjectRestResponse<?> get(Dictionary dictionary) {
+    public ObjectRestResponse<List<Dictionary>> get(Dictionary dictionary) {
         return dictionaryBiz.get(dictionary);
     }
 
@@ -42,7 +44,7 @@ public class DictionaryController {
 
     @GetMapping(value = "/getParents")
     @ApiOperation(value = "获取所有的父类元素 pid=0")
-    public ObjectRestResponse getParent(String type) {
+    public ObjectRestResponse<List<Dictionary>> getParent(String type) {
         return dictionaryBiz.getParent(type);
     }
 }