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

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

@@ -8,6 +8,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import tk.mybatis.spring.annotation.MapperScan;
@@ -29,6 +30,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableAceCache
 @EnableTransactionManagement
 @MapperScan("com.github.wxiaoqi.security.admin.mapper")
+@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
 //@EnableSwagger2Doc
 public class AdminBootstrap {
     public static void main(String[] args) {

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

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
@@ -30,14 +31,14 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
     AppUserDetailBiz detailBiz;
 
    //获取用户会员信息
-    @Cache(key = "user:member{1}")
+   @Cache(key = "user:member{1}")
     public UserMemberVo getMemberInfoByUserId(Integer userId){
         return  mapper.getInfoByUserId(userId);
     }
 
     //更新会员信息
     @Override
-    @CacheClear(pre = "user:member{1.userId}")
+    @CacheClear(key = "user:member{1.userId}")
     public  void  updateSelectiveById(BaseUserMember userMember){  super.updateSelectiveById(userMember);}
 
 
@@ -61,13 +62,23 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
             baseUserMember.setBuyCount(1);
             insertSelective(baseUserMember);
         }else {
+            Integer discount=userMemberVo.getDiscount()==null?0:userMemberVo.getDiscount();
+            Integer discount1=baseUserMember.getDiscount()==null?0:baseUserMember.getDiscount();
+            if(discount<discount1){
+                baseUserMember.setDiscount(discount);
+            }
+            Integer level=userMemberVo.getMemberLevel()==null?0:userMemberVo.getMemberLevel();
+            Integer level1=baseUserMember.getMemberLevel()==null?0:baseUserMember.getMemberLevel();
+            if(level>level1){
+                baseUserMember.setMemberLevel(level);
+            }
             baseUserMember.setId(userMemberVo.getId());
             totalNumber+=userMemberVo.getTotalNumber()==null?0:userMemberVo.getTotalNumber();
             freeDays+=userMemberVo.getRentFreeDays()==null?0:userMemberVo.getRentFreeDays();
             baseUserMember.setBuyCount(userMemberVo.getBuyCount()+1);
             baseUserMember.setTotalNumber(totalNumber);
             baseUserMember.setRentFreeDays(freeDays);
-            updateSelectiveById(baseUserMember);
+            getMyBiz().updateSelectiveById(baseUserMember);
         }
         AppUserVo userVo= detailBiz.getUserInfoById(userId);
         if(userVo!=null&&(userVo.getIsMember()==null||userVo.getIsMember()==0)){
@@ -106,7 +117,7 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
                 if(freeDays>0&&freeDays>=days){
                     freeDays=freeDays-days;
                     baseUserMember.setRentFreeDays(freeDays);
-                    updateSelectiveById(baseUserMember);
+                    getMyBiz().updateSelectiveById(baseUserMember);
                     num=freeDays;
                 }
             }else if(type==2){
@@ -122,17 +133,17 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
                 Integer payCount=userMemberVo.getPayCount()==null?0:userMemberVo.getPayCount();
                 payCount=payCount+1;
                 baseUserMember.setPayCount(payCount);
-                updateSelectiveById(baseUserMember);
+                getMyBiz().updateSelectiveById(baseUserMember);
                 num=freeDays;
             }else {
                 /*lockDays=lockDays>0?(lockDays-days)>0?(lockDays-days):0:0;
                 baseUserMember.setLockDays(lockDays);
-                updateSelectiveById(baseUserMember);
+                getMyBiz().updateSelectiveById(baseUserMember);
                 num=freeDays-lockDays;*/
                 freeDays=(freeDays+days)>0?(freeDays+days):0;
                 freeDays=freeDays>totalNumber?totalNumber:freeDays;
                 baseUserMember.setRentFreeDays(freeDays);
-                updateSelectiveById(baseUserMember);
+                getMyBiz().updateSelectiveById(baseUserMember);
                 num=freeDays;
             }
 
@@ -140,7 +151,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper,BaseUserMemb
         return  num;
     }
 
-
+    private BaseUserMemberBiz getMyBiz() {
+        return AopContext.currentProxy() != null ? (BaseUserMemberBiz) AopContext.currentProxy() : this;
+    }
 
 
 }
\ No newline at end of file

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

+package com.xxfc.platform.order.pojo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class UnitPriceDTO {
+    @ApiModelProperty(value = "旅游保险单价")
+    private BigDecimal insurePrice;
+}
\ No newline at end of file

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

@@ -24,8 +24,11 @@ import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.mqhandler.RabbitProduct;
 import com.xxfc.platform.order.pojo.order.CancelOrderDTO;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
+import com.xxfc.platform.order.pojo.order.UnitPriceDTO;
 import com.xxfc.platform.order.pojo.pay.RentVehicleOrderPayVO;
+import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.constant.enumerate.PayChannelEnum;
+import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.vehicle.common.RestResponse;
@@ -47,8 +50,11 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
+
 @Controller
 @RequestMapping("baseOrder")
 @Api(value = "订单", tags = {"订单"})
@@ -83,6 +89,18 @@ public class BaseOrderController extends CommonBaseController {
     String qrcodePrefix = "fcwx://order";
     String notifyUrl = "/baseOrder/app/unauth/notifyUrl";
 
+    @RequestMapping(value = "/app/unauth/getOrderUnitPrice", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "获取订单相关的单价")
+    @IgnoreClientToken
+    @IgnoreUserToken
+    public ObjectRestResponse<UnitPriceDTO> getOrderUnitPrice() {
+        Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+        return ObjectRestResponse.succ(new UnitPriceDTO(){{
+            setInsurePrice(new BigDecimal(dictionaryMap.get(APP_ORDER+ "_"+ DictionaryKey.INSURE_PRICE).getDetail()));
+        }});
+    }
+
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "订单列表")

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodDetailBiz.java

@@ -75,6 +75,9 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
                     }
 
                 }
+                //获取banner
+                List<GoodBannerDTO> bannerList = bannerMapper.getBannerList(id);
+                detailVo.setBannerDTOS(bannerList);
                 //获取出行时间
                 List<TourDepartTimeVo> timelist = priceMapper.getAllByGoodId(id);
                 detailVo.setTourDepartTimeVo(timelist);

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

@@ -73,6 +73,6 @@ public interface ThirdFeign {
 
 
     /*****************************************  违章 ********************************************/
-    @GetMapping("/getRentViolation")
+    @GetMapping("/3p/tv/getRentViolation")
     public ObjectRestResponse<List<ViolationVO>> getRentViolation(@RequestParam(value = "rentViolationDTO") Map<String, Object> rentViolationDTO);
 }