Merge remote-tracking branch 'origin/master'

xuhy

2025-11-27 af805ef132e8033c768bd6f734f6682ee341f4c2

Merge remote-tracking branch 'origin/master'

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/CourseController.java

@@ -133,8 +133,8 @@
        courseOrder.setOrderNumber(OrderNos.getDid());
        boolean save = courseOrderService.save(courseOrder);
        if (save) {
//            Map<String, Object> result = wxV3Pay.jsApi(courseOrder.getOrderNumber(), course.getCourseCost().multiply(BigDecimal.valueOf(100)).longValue(), appUser.getOpenId(),"购买课程","");
            return R.ok();
            Map<String, Object> result = wxV3Pay.jsApi(courseOrder.getOrderNumber(), course.getCourseCost().multiply(BigDecimal.valueOf(100)).longValue(), appUser.getOpenId(),"购买课程","");
            return R.ok(result);
        }

        Map<String, ? extends Object> maps =

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/UserIndexController.java

@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.UpdatePhoneDto;
import com.ruoyi.system.dto.UpdateUserDto;
import com.ruoyi.system.model.TAppUser;
import com.ruoyi.system.model.TAppealServices;
import com.ruoyi.system.model.TChildcareServices;
@@ -132,4 +133,44 @@
        return R.ok();
    }


    @ApiOperation(value = "个人中心--修改信息")
    @PostMapping(value = "/updateUserInfo")
    public R<?> updateUserInfo(@RequestBody UpdateUserDto dto) {
        String userId = tokenService.getLoginUserApplet().getUserId();
        TAppUser appUser = tAppUserService.getById(userId);

        if(dto.getAvatar()!=null){
            appUser.setAvatar(dto.getAvatar());
        }

        if(dto.getNickName()!=null){
            appUser.setNickName(dto.getNickName());
        }

        if(dto.getGender()!=null){
            appUser.setGender(dto.getGender());
        }

        if(dto.getBirthday()!=null){
            appUser.setBirthDate(dto.getBirthday());
        }

        if(dto.getName()!=null){
            appUser.setName(dto.getName());
        }


        if(dto.getPhone()!=null){
            long count = tAppUserService.count(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getPhoneNumber, dto.getPhone()).ne(TAppUser::getId, userId));
            if (count > 0) {
                return R.fail("手机号已存在");
            }
            appUser.setPhoneNumber(dto.getPhone());
        }
        tAppUserService.updateById(appUser);

        return R.ok();
    }

}

 ruoyi-applet/src/main/resources/application-test.yml

@@ -198,23 +198,23 @@
payment:
  wx:
    # 微信appid
    appId: wx618aa69186bf2ed6
    appId: wxe91f1af7638aa5dd
    # 微信商户号
    mchId:
    mchId: 1678345627
    # 秘钥
    secretId:
    secretId: a787e1a462715604e0c9528b6d8960d1
    v3:
      # 加签串
      apiKey:
      apiKey: E10ADC3949BA59ABBE56E057F20F883E
      # 加签证书地址
      privateKeyPath:
      privateKeyPath: E:\qiyeweixin\WXWork\1688857859704927\Cache\File\2025-11\333\apiclient_key.pem
      # 微信支付公钥id
      publicKeyId:
      # 微信支付公钥证书
      publicKeyPath:
      publicKeyPath: E:\qiyeweixin\WXWork\1688857859704927\Cache\File\2025-11\333\apiclient_cert.pem
      # 证书序列号
      mchSerialNo:
      mchSerialNo: 6C90982EFB55341700A70A33CF8BED58938FB0E2
      # 支付成功回调地址
      notifyPayUrl:
      notifyPayUrl: http://221.182.45.100:9100/api/wx/pay/notify
      # 支付退款回调地址
      notifyRefundUrl:
      notifyRefundUrl: http://21.182.45.100:9100/api/wx/refund/notify

 ruoyi-system/src/main/java/com/ruoyi/system/dto/UpdateUserDto.java

New file
@@ -0,0 +1,32 @@
package com.ruoyi.system.dto;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDate;

@Data
@ApiModel("修改用户信息dto")
public class UpdateUserDto {
    @ApiModelProperty("头像")
    private String avatar;


    @ApiModelProperty("用户名")
    private String name;

    @ApiModelProperty("昵称")
    private String nickName;

    @ApiModelProperty("1：男，2：女")
    private Integer gender;

    @ApiModelProperty("生日")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private LocalDate birthday;
    @ApiModelProperty("手机号")
    private String phone;

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TAppUser.java

@@ -34,6 +34,9 @@
    @ApiModelProperty(value = "用户昵称")
    @TableField("nick_name")
    private String nickName;
    @ApiModelProperty(value = "用户名")
    @TableField("name")
    private String name;

    @ApiModelProperty(value = "头像")
    @TableField("avatar")

 ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WXPayUtility.java

@@ -127,8 +127,8 @@
   */
  public static PublicKey loadPublicKeyFromString(String keyString) {
    try {
      keyString = keyString.replace("-----BEGIN PUBLIC KEY-----", "")
          .replace("-----END PUBLIC KEY-----", "")
      keyString = keyString.replace("-----BEGIN CERTIFICATE-----", "")
          .replace("-----END CERTIFICATE-----", "")
          .replaceAll("\\s+", "");
      return KeyFactory.getInstance("RSA").generatePublic(
          new X509EncodedKeySpec(Base64.getDecoder().decode(keyString)));