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

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

@@ -28,7 +28,7 @@ public class AppUserPositionBiz extends BaseBiz<AppUserPositionMapper,AppUserPos
 
 
     //获取用户职位的折扣
-    public  Integer getExtract(Integer userId){
+    public  AppUserPosition getExtract(Integer userId){
          return  mapper.getExtractByUserId(userId);
     }
 

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

@@ -103,6 +103,21 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
 
         Integer parentId = relation.getParentId();
         log.info("购买计算用户拥金----payOrderWater--------userId===" + userId + "---parentId===" + parentId);
+        Integer positionId = 6;
+        Integer level = 0;
+        AppUserPosition position=positionBiz.getExtract(parentId);
+        if (position!=null){
+            positionId=position.getId();
+        }
+        AppUserPosition position1=positionBiz.getExtract(userId);
+        if (position!=null){
+            level=position1.getLevel();
+        }
+        log.info("购买计算用户拥金----payOrderWater--------userId===" + userId + "---positionId===" + positionId+"---level==="+level);
+        if(level!=0){
+            log.info("购买计算用户拥金----payOrderWater--------userId===" + userId +"----无法享受拥金");
+            return;
+        }
         BigDecimal amount = new BigDecimal("0.00");
         //商品类型
         Integer orderType=0;
@@ -115,13 +130,9 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
             orderType = goodsDto.getType();
             //商品比例
             Integer extract = commissionBiz.getExtract(orderType, goodId);
-            AppUserVo userVo = detailBiz.getUserInfoById(parentId);
-            Integer positionId = 6;
-            if (userVo != null) {
-                positionId = userVo.getPositionId();
-            }
+
             if (extract == null || extract == 0) {
-                extract = positionBiz.getExtract(parentId);
+                extract = position.getExtract();
             }
             log.info("购买计算用户拥金----payOrderWater--------userId===" + userId + "---extract===" + extract);
             if (extract != null && extract > 0) {
@@ -184,7 +195,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 log.info("订单完成计算用户拥金----finishOrderWater----id====" + id + "---commission==" + commission+"----orderType==="+orderType);
                 amount = amount.add(commission);
             }
-        }
+
             log.info("订单完成计算用户拥金----finishOrderWater----orderId====" + orderId + "---amount==" + amount);
             int r = amount.compareTo(BigDecimal.ZERO);
             //更新钱包
@@ -200,6 +211,8 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 }
 
             }
+        }
+
 
     }
 
@@ -230,7 +243,6 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
                 log.info("订单完成计算用户拥金----refundOrderWater----id====" + id + "---commission==" + commission+"---orderType===="+orderType);
                 unbooked=unbooked.add(commission);
             }
-        }
             log.info("订单完成计算用户拥金----refundOrderWater----orderId====" + orderId + "---amount==" + amount+"---unbooked==="+unbooked);
             int r = amount.compareTo(BigDecimal.ZERO);
             //更新钱包
@@ -245,6 +257,7 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
             if(orderType==1||orderType==2){
                 myWaterBiz.updMyWalletUnbooked(userId,unbooked,2);
             }
+        }
 
     }
 

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

@@ -113,7 +113,8 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
 
     //钱包未入账的处理type1-进;2-出
     public  void updMyWalletUnbooked(Integer userId,BigDecimal amount,Integer type){
-        log.info("---钱包未入账的处理updMyWalletUnbooked----userId==="+userId+"----type==="+type);
+        log.info("---钱包未入账的处理updMyWalletUnbooked----userId==="+userId+"----type==="+type+"---amount==="+amount);
+
         MyWallet wallet=new MyWallet();
         wallet.setUserId(userId);
         wallet=selectOne(wallet);

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

@@ -17,6 +17,6 @@ import java.util.List;
 public interface AppUserPositionMapper extends Mapper<AppUserPosition> {
 
 
-    Integer getExtractByUserId(@Param("userId")Integer userId);
+    AppUserPosition getExtractByUserId(@Param("userId")Integer userId);
 
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserPositionMapper.xml

@@ -16,8 +16,8 @@
         <result property="isDel" column="is_del"/>
     </resultMap>
 
-    <select id="getExtractByUserId" resultType="Integer">
-       SELECT p.extract FROM app_user_detail d LEFT JOIN app_user_position p
+    <select id="getExtractByUserId" resultMap="appUserPositionMap">
+       SELECT p.* FROM app_user_detail d LEFT JOIN app_user_position p
        ON d.position_id=p.id
        WHERE d.userid=#{userId} LIMIT 1
     </select>

xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/vo/QuestionListVo.java

@@ -11,4 +11,5 @@ import java.util.List;
 public class QuestionListVo extends ImQuestion {
     List<ImComment> imComment;
     List<ImPraise> imPraise;
+    private boolean isPraise;
 }

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/ImPraiseBiz.java

@@ -10,11 +10,13 @@ import com.xxfc.platform.im.entity.ImPraise;
 import com.xxfc.platform.im.entity.ImQuestion;
 import com.xxfc.platform.im.mapper.ImPraiseMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.map.HashedMap;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @Service
@@ -91,4 +93,12 @@ public class ImPraiseBiz extends BaseBiz<ImPraiseMapper, ImPraise> {
         return list;
     }
 
+    public boolean isExist(Integer userId, Long questionId) {
+        Map<String, Object> map = new HashedMap<>();
+        map.put("userId", userId);
+        map.put("questionId",questionId);
+        List<ImPraise> list = mapper.selectByUserIdAndQuestionId(map);
+        return list.size() > 0 ? true : false;
+    }
+
 }

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/ImQuestionBiz.java

@@ -12,6 +12,7 @@ import com.xxfc.platform.im.dto.QuestionParamDto;
 import com.xxfc.platform.im.dto.UpdateTypeEnum;
 import com.xxfc.platform.im.entity.ImQuestion;
 import com.xxfc.platform.im.mapper.ImQuestionMapper;
+import com.xxfc.platform.im.vo.QuestionListVo;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,8 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
     @Autowired
     MQSenderFeign mqSenderFeign;
 
+    @Autowired
+    ImPraiseBiz imPraiseBiz;
     /**
      * 获取列表
      *
@@ -36,7 +39,12 @@ public class ImQuestionBiz extends BaseBiz<ImQuestionMapper, ImQuestion> {
      */
     public ObjectRestResponse getList(QuestionParamDto questionParamDto) {
         Query query = new Query(questionParamDto);
-        PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getQuestionList(query.getSuper()));
+        PageDataVO<QuestionListVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getQuestionList(query.getSuper()));
+        AppUserDTO appUserDTO = userBiz.getUserInfo();
+        if(appUserDTO != null) {
+            pageDataVO.getData().forEach((a) -> a.setPraise(imPraiseBiz.isExist(appUserDTO.getUserid(), a.getId())));
+        }
+
     return new ObjectRestResponse<>().data(pageDataVO);
     }
 

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/mapper/ImPraiseMapper.java

@@ -4,6 +4,7 @@ import com.xxfc.platform.im.entity.ImPraise;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ImPraiseMapper extends Mapper<ImPraise> {
 
@@ -11,4 +12,6 @@ public interface ImPraiseMapper extends Mapper<ImPraise> {
 
     List<ImPraise> selectByQuestionIdAndTime(ImPraise imPraise);
 
+    List<ImPraise> selectByUserIdAndQuestionId(Map<String, Object> param);
+
 }
\ No newline at end of file

xx-im/xx-im-server/src/main/resources/mapper/ImPraiseMapper.xml

@@ -24,4 +24,10 @@
         where question_id = #{questionId} and is_del = 0 and visible = 1
         and time between #{startTime} and #{endTime}
   </select>
+
+  <select id="selectByUserIdAndQuestionId" resultType="com.xxfc.platform.im.entity.ImPraise" parameterType="java.util.Map">
+      select * from im_praise
+        where question_id = #{questionId} and is_del = 0 and visible = 1
+        and user_id = #{userId}
+  </select>
 </mapper>
\ No newline at end of file

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

@@ -316,20 +316,20 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
         //计算退款金额
             // 1、押金 + 租金(规则扣除)
         //BigDecimal refundGoodsAmount = baseOrder.getGoodsAmount();
-        String refundDesc = "取消订单退款:";
+        StringBuilder refundDescBuilder = new StringBuilder("取消订单退款:");
         if(null == depositAmount) {
             depositAmount = BigDecimal.ZERO;
         }
         //商品价格 - 优惠券减免的价格
-        BigDecimal refundGoodsAmount = calculateRefund(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()), timeLag, dicParentKey, refundDesc);
+        BigDecimal refundGoodsAmount = calculateRefund(baseOrder.getGoodsAmount().subtract(baseOrder.getCouponAmount()), timeLag, dicParentKey, refundDescBuilder);
 
         //退款金额
         BigDecimal refundAmount = depositAmount.add(refundGoodsAmount);
         //退款子流程: 订单基础，退款描述，退款金额
-        refundSubProcess(baseOrder, refundDesc, refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
+        refundSubProcess(baseOrder, refundDescBuilder.toString(), refundAmount, RefundTypeEnum.ORDER_FUND.getCode(), RefundStatusEnum.ALL.getCode());
     }
 
-    public BigDecimal calculateRefund(BigDecimal goodsAmount, Long timeLag, String dicParentKey, String refundDesc) {
+    public BigDecimal calculateRefund(BigDecimal goodsAmount, Long timeLag, String dicParentKey, StringBuilder refundDescBuilder) {
         BigDecimal refundGoodsAmount = goodsAmount;
 
         //根据时间处理goodsAmount
@@ -354,7 +354,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                     //ga : goodsAmount
                     set("ga", goodsAmount);
                 }})).toString());
-                refundDesc = names[1]+ ","+ refundDesc;
+                refundDescBuilder = refundDescBuilder.insert(0, names[1]+ ",");
                 break;
             }
         }

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

@@ -92,7 +92,7 @@ public class OrderTourVerificationBiz{
         }
 
         // 出发时间 是否已经发车
-        Date departureDate = tourFeign.selectDepartureDataBySpeId(tourDetail.getSpePriceId());
+      /*  Date departureDate = tourFeign.selectDepartureDataBySpeId(tourDetail.getSpePriceId());
         Long departureTime = tourFeign.selectDepartureTimeByStartCompanyIdAndRouteId(tourDetail.getStartCompanyId(), tourDetail.getGoodId());
         Integer departureStatus = tourFeign.selectDepartureStatusByVerificationId(verificationId);
         LocalTime localDepartureTime = LocalTime.ofSecondOfDay(departureTime);
@@ -113,7 +113,7 @@ public class OrderTourVerificationBiz{
 
         if (departureStatus==1){
             return ObjectRestResponse.createFailedResultWithObj(400,"已经发车",1);
-        }
+        }*/
 
 
         baseOrder=new BaseOrder();

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

@@ -24,6 +24,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.math.BigDecimal;
 
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
+import static com.xxfc.platform.universal.constant.DictionaryKey.TOUR_IN_REFUND;
+import static com.xxfc.platform.universal.constant.DictionaryKey.TOUR_REFUND;
 
 @Controller
 @RequestMapping("orderRefund")
@@ -40,10 +43,10 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         return userFeign;
     }
 
-    @RequestMapping(value = "/price/calculate/{type}/{no}", method = RequestMethod.GET)
+    @RequestMapping(value = "/price/calculate/{no}", method = RequestMethod.GET)
     @ResponseBody
     @IgnoreClientToken
-    public ObjectRestResponse getPriceCalculate(@PathVariable(value = "type") String type, @PathVariable(value = "no") String no) {
+    public ObjectRestResponse<BigDecimal> getPriceCalculate(@PathVariable(value = "no") String no) {
         checkAppUser();
         //根据no 查订单
         OrderPageVO orderPageVO = baseOrderBiz.pageByParm(new Query(new PageParam(){{
@@ -51,36 +54,38 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
             setPage(1);
         }}){{put("no", no); }}.getSuper()).get(0);
 
-        OrderRefundPriceVO orp = new OrderRefundPriceVO(){{
-            setRealAmount(orderPageVO.getRealAmount());
-        }};
-
         OrderTypeEnum orderTypeEnum = OrderTypeEnum.get(orderPageVO.getType());
 
+        BigDecimal orderRefundAmount = BigDecimal.ZERO;
+        StringBuilder refundDescBuilder = new StringBuilder("");
+
         switch (orderTypeEnum) {
             case RENT_VEHICLE:
-                baseOrderBiz.calculateRefund(orderPageVO.getGoodsAmount()
-                        , System.currentTimeMillis() - orderPageVO.getOrderRentVehicleDetail().getStartTime()
+                orderRefundAmount = baseOrderBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
+                        , orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis()
                         , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
-                        , "取消订单退款:");
+                        , refundDescBuilder);
                 break;
             case TOUR:
-//                String dicParentKey = DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.TOUR_REFUND;
-//                //不是省外，
-//                if(SYS_FALSE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
-//                    dicParentKey = DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.TOUR_IN_REFUND;
-//                }
-//                orp.setRefundAmount(baseOrderBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
-//                        , System.currentTimeMillis() - orderPageVO.getOrderRentVehicleDetail().getStartTime()
-//                        , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
-//                        , "取消订单退款:"));
+                //判断是省内还是省外
+                String key = TOUR_IN_REFUND;
+                if(SYS_TRUE.equals(orderPageVO.getOrderTourDetail().getIsOutside())) {
+                    key = TOUR_REFUND;
+                }
+                orderRefundAmount = baseOrderBiz.calculateRefund(orderPageVO.getGoodsAmount().subtract(orderPageVO.getCouponAmount())
+                        , orderPageVO.getOrderTourDetail().getStartTime() - System.currentTimeMillis()
+                        , DictionaryKey.APP_ORDER+ "_"+ DictionaryKey.RENT_REFUND
+                        , refundDescBuilder);
                 break;
             default:
-//                orp.setRefundAmount(orderPageVO);
                 break;
         }
 
-        return null;
+        OrderRefundPriceVO orpv = new OrderRefundPriceVO();
+        orpv.setRealAmount(orderPageVO.getRealAmount());
+        orpv.setRefundAmount(orderRefundAmount);
+        orpv.setRefundDesc(refundDescBuilder.toString());
+        return ObjectRestResponse.succ(orpv);
     }
 
     @Data
@@ -88,10 +93,11 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
         BigDecimal refundAmount;
         BigDecimal realAmount;
         BigDecimal cutAmount;
+        String refundDesc;
 
         public void setRefundAmount(BigDecimal refundAmount) {
             this.refundAmount = refundAmount;
-            this.cutAmount = realAmount.multiply(refundAmount);
+            this.cutAmount = realAmount.subtract(refundAmount);
         }
     }
 }
\ No newline at end of file