puzhibing
昨天 f6b68bb83a169418569ec36684015860ff9aee26
Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

# Conflicts:
# ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
1个文件已添加
4个文件已修改
85 ■■■■■ 已修改文件
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-shop/pom.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/MsgUtils.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberNoClearOrderVo.java
@@ -6,6 +6,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
/**
 * @author jqs34
@@ -62,4 +63,7 @@
    @ApiModelProperty(value = "结清标记0未结清1已结清")
    private Integer closeFlag;
    @ApiModelProperty("商品明细")
    private List<AppGoodsInfoVo> goodsList;
}
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -3279,6 +3279,17 @@
                if (merMemberNoClearOrderVo.getUnPaidMoney().compareTo(zeroBig) < 0) {
                    merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
                }
                String orderId = merMemberNoClearOrderVo.getOrderId();
                List<OrderGoods> list = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, orderId));
                List<AppGoodsInfoVo> goodsInfoVos = new ArrayList<>();
                for (OrderGoods orderGoods : list) {
                    AppGoodsInfoVo info = new AppGoodsInfoVo();
                    info.setGoodsName(orderGoods.getGoodsName());
                    info.setSalesNum(orderGoods.getBuyNum());
                    info.setGoodsType(orderGoods.getGoodsType());
                    goodsInfoVos.add(info);
                }
                merMemberNoClearOrderVo.setGoodsList(goodsInfoVos);
            }
        }
        return merMemberNoClearOrderVoList;
ruoyi-modules/ruoyi-shop/pom.xml
@@ -153,6 +153,11 @@
            <artifactId>aliyun-sdk-oss</artifactId>
            <version>3.15.1</version>
        </dependency>
        <dependency>
            <groupId>com.aliyun</groupId>
            <artifactId>alibabacloud-dysmsapi20170525</artifactId>
            <version>2.0.24</version>
        </dependency>
        <!-- 测试类 -->
        <dependency>
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
@@ -15,6 +16,7 @@
import com.ruoyi.shop.service.shop.ShopAppointableTimeService;
import com.ruoyi.shop.service.shop.ShopNonAppointableTimeService;
import com.ruoyi.shop.service.shop.ShopService;
import com.ruoyi.shop.util.MsgUtils;
import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import com.ruoyi.system.api.domain.dto.AppointmentTimeDto;
import com.ruoyi.system.api.domain.dto.ShopAppointmentTimeDto;
@@ -111,6 +113,13 @@
        one.setStatus(1);
        one.setCreateTime(LocalDateTime.now());
        shopAppointableTimeService.save(one);
        //发送短信给商家
        String msg = "{}";
        try {
            MsgUtils.sendMsg(shop.getShopownerPhone(), "", msg);
        } catch (Exception e) {
            e.printStackTrace();
        }
        return R.ok();
    }
    
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/util/MsgUtils.java
New file
@@ -0,0 +1,56 @@
package com.ruoyi.shop.util;
import com.alibaba.nacos.shaded.com.google.gson.Gson;
import com.aliyun.auth.credentials.Credential;
import com.aliyun.auth.credentials.provider.StaticCredentialProvider;
import com.aliyun.sdk.service.dysmsapi20170525.AsyncClient;
import com.aliyun.sdk.service.dysmsapi20170525.models.SendSmsRequest;
import com.aliyun.sdk.service.dysmsapi20170525.models.SendSmsResponse;
import darabonba.core.client.ClientOverrideConfiguration;
import java.util.concurrent.CompletableFuture;
/**
 * @author jqs34
 * @version 1.0
 * @classname MsgUtils
 * @description: TODO
 * @date 2023 2023/8/6 12:48
 */
public class MsgUtils {
    public static void sendMsg(String phoneNumber,String templateCode,String sendContent) throws Exception {
        StaticCredentialProvider provider = StaticCredentialProvider.create(Credential.builder()
                .accessKeyId("LTAI5tAfKFuhyKFH12CTkXFj")
                .accessKeySecret("tIBRuonHuQQPdcYrmlCdXlexOSwVXe")
                .build());
        AsyncClient client = AsyncClient.builder()
                .credentialsProvider(provider)
                .overrideConfiguration(
                        ClientOverrideConfiguration.create()
                                // Endpoint 请参考 https://api.aliyun.com/product/Dysmsapi
                                .setEndpointOverride("dysmsapi.aliyuncs.com")
                )
                .build();
        SendSmsRequest sendSmsRequest = SendSmsRequest.builder()
                .phoneNumbers(phoneNumber)
                .signName("鸿瑞堂")
                .templateCode(templateCode)
                .templateParam(sendContent)
                .build();
        CompletableFuture<SendSmsResponse> response = client.sendSms(sendSmsRequest);
        SendSmsResponse resp = response.get();
        System.out.println(new Gson().toJson(resp));
        client.close();
    }
}