Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

4 天以前 31737adbd155f37bd5d523f93dbaf44edcf27de5

Merge remote-tracking branch 'origin/2.0' into 2.0

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppLotteryEventController.java

@@ -192,6 +192,7 @@
            } else {
                current++;
                //下一题
                current++;
                if (current >= count) {
                    return R.fail("操作失败");
                }

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java

@@ -21,7 +21,9 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @ClassName AppIntegralController
@@ -81,7 +83,7 @@
    
    @RequestMapping(value = "/signShare", method = RequestMethod.POST)
    @ApiOperation(value = "今日分享【2.0】")
    public R<String> signShare() {
    public R<Map<String, Object>> signShare() {
        Long userId = SecurityUtils.getUserId();
        IntegralChangeDto integralChangeDto = new IntegralChangeDto();
        integralChangeDto.setIntegralType(1);
@@ -92,6 +94,13 @@
        }
        //判断是否可以抽奖
        List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
        return R.ok(data.size() > 0 ? data.get(0).getId() : "");
        Map<String, Object> map = new HashMap<>();
        if(data.size() > 0){
            TLotteryEvent tLotteryEvent = data.get(0);
            map.put("lotteryEventId", tLotteryEvent.getId());
            map.put("name", tLotteryEvent.getActivityProfile());
            map.put("image", tLotteryEvent.getCoverImage());
        }
        return R.ok(map);
    }
}

 ruoyi-modules/ruoyi-member/src/main/resources/mapper/birthday/BirthdayCardMapper.xml

@@ -23,7 +23,7 @@
                   WHEN 2 THEN CONCAT(goods_name, "商品")
                   WHEN 4 THEN CONCAT(gift_name, "实物")
                   WHEN 3 THEN CONCAT("现金", money, "元")
                   WHEN 5 THEN "积分"
                   WHEN 5 THEN CONCAT(integral_number, "积分")
                   END       prizeName,
               CASE prize_from
                   WHEN 1 THEN "生日卡"

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -864,6 +864,18 @@
            appMemberGoodsTypeDto.setGoodsTypeSet(goodsTypeSet);
            remoteMemberService.updateMemberGoodsType(appMemberGoodsTypeDto);
        }

        appPlaceOrderVo.setLotteryDraw(false);
        // 返回AppPlaceOrderVo对象
        List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(2).getData();
        if (data.size() > 0) {
            BigDecimal finalOrderPayMoney = orderPayMoney;
            List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(finalOrderPayMoney) <= 0).collect(Collectors.toList());
            if (collect.size() > 0) {
                appPlaceOrderVo.setLotteryDraw(true);
                appPlaceOrderVo.setLotteryEventId(collect.get(0).getId());
            }
        }
        return appPlaceOrderVo;
    }


 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java

@@ -114,7 +114,7 @@
        one.setCreateTime(LocalDateTime.now());
        shopAppointableTimeService.save(one);
        //发送短信给商家
        String msg = "{\"name\":\"\"}";
        String msg = "{\"time\":\"" + dto.getTime() + "\"}";
        try {
            MsgUtils.sendMsg(shop.getShopownerPhone(), "SMS_491310429", msg);
        } catch (Exception e) {