Merge remote-tracking branch 'origin/master' into test

src/main/java/com/example/xiaoshiweixinback/service/InviteMessageService.java

@@ -78,7 +78,7 @@ public class InviteMessageService extends ServiceImpl<InviteMessageMapper, Invit
                 return 0;
             } else {
                 //TODO 给邀请人赠送优惠券
-                activityService.doingActivity(inviteMessage.getInvitePersonUuid(),ACTIVITY_SCOPE);
+                activityService.doingActivity(inviteMessage.getInvitePersonUuid() ,ACTIVITY_SCOPE);
                 inviteMessage.setIfBuyVip(true);
                 inviteMessage.updateById();
                 return 3;

src/main/java/com/example/xiaoshiweixinback/service/MonitorService.java

@@ -71,9 +71,6 @@ public class MonitorService extends ServiceImpl<MonitorMapper, Monitor> {
         String monitorPeriod = addMonitoringDTO.getMonitorPeriod();
         Integer concernType = addMonitoringDTO.getConcernType();
          Monitor orgMonitor =this.checkAdmin(productId);
-         if(orgMonitor!=null){
-             return productId;
-         }
         //关注产品
         if (productId != null) {
             AssoPersonProductDTO assoPersonProductDTO = new AssoPersonProductDTO();

src/main/java/com/example/xiaoshiweixinback/service/OrderService.java

@@ -127,7 +127,7 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
      BigDecimal withVocherPriceBig =allPriceBig.subtract(voucherMonBig);
         BigDecimal discontBig =new BigDecimal(discount.toString());
 
-     if(voucherMonBig.doubleValue()<=0){
+     if(withVocherPriceBig.doubleValue()<=0){
          withVocherPriceBig=new BigDecimal("0");
      }
         //查看是否有折扣
@@ -137,6 +137,7 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
 
      System.out.println("折扣"+discontBig);
      Double truePrice=truePriceBig.doubleValue();
+     System.out.println("总价"+truePrice);
         if(!truePrice.equals(price)){
             throw new BusinessException(ExceptionEnum.BUSINESS_ERROR,"价格错误");
         }