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

ace-common/pom.xml

@@ -109,6 +109,14 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.13</version>
         </dependency>
+
+        <!-- 公式计算 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-jexl</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
     </dependencies>
 
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -73,6 +73,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
         if(userVo!=null&&(userVo.getIsMember()==null||userVo.getIsMember()==0)){
             AppUserVo userVo1=new AppUserVo();
             userVo1.setId(userVo.getId());
+            userVo1.setUserid(userId);
             userVo1.setIsMember(1);
             detailBiz.updUuserInfoById(userVo1);
         }

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

 package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderMemberDetail;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderTourDetail;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
@@ -18,6 +19,8 @@ public class OrderPageVO extends BaseOrder {
 
     OrderTourDetail orderTourDetail;
 
+    OrderMemberDetail orderMemberDetail;
+
     List<VehicleUserLicense> vehicleUserLicenses;
 
     private String username;

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

@@ -283,13 +283,15 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                 }});
 
                 //触发会员效益
-                userFeign.buyMember(new UserMemberDTO() {{
+                ObjectRestResponse orr = userFeign.buyMember(new UserMemberDTO() {{
                     setUserId(baseOrder.getUserId());
                     setDiscount(omd.getRebate());
                     setIsBind(ISBIND_BIND);
                     setMemberLevel(omd.getMemberLevel());
                     setRentFreeDays(omd.getRentFreeNum());
+                    setTotalNumber(omd.getRentFreeNum());
                 }});
+                log.info("orr.getStatus() : " + orr.getStatus() );
             }else if(OrderTypeEnum.RentVehicle.getCode().equals(baseOrder.getType())) {
                 updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
                 OrderRentVehicleDetail orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail(){{

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

@@ -258,7 +258,7 @@ public class BaseOrderController extends CommonBaseController {
         orderPayVo.setAmount(baseOrder.getRealAmount().multiply(new BigDecimal("100")).intValue());
         orderPayVo.setBody(baseOrder.getName());
         orderPayVo.setBuyerIp(StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request)));
-        orderPayVo.setChannel(PayChannelEnum.ORDER_CRT.getCode());
+        orderPayVo.setChannel(baseOrder.getType());
         orderPayVo.setNotifyUrl(insideHost + order + notifyUrl + "?orderNo=" + baseOrder.getNo());
         orderPayVo.setSubject(baseOrder.getName());
         orderPayVo.setUserId(baseOrder.getUserId());

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -34,6 +34,9 @@
             <case value="2" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
                 <association column="detail_id" property="orderTourDetail" select="com.xxfc.platform.order.mapper.OrderTourDetailMapper.selectByPrimaryKey" javaType="com.xxfc.platform.order.entity.OrderTourDetail"></association>
             </case>
+            <case value="3" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
+                <association column="detail_id" property="orderMemberDetail" select="com.xxfc.platform.order.mapper.OrderMemberDetailMapper.selectByPrimaryKey" javaType="com.xxfc.platform.order.entity.OrderMemberDetail"></association>
+            </case>
         </discriminator>
     </resultMap>
     

xx-order/xx-order-server/src/main/resources/mapper/OrderMemberDetailMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.xxfc.platform.order.mapper.OrderMemberDetailMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.xxfc.platform.order.entity.OrderMemberDetail" id="orderMemberDetailMap">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="name" column="name"/>
+        <result property="crtTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="rentFreeNum" column="rent_free_num"/>
+        <result property="rentPercent" column="rent_percent"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file