Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi in...

puzhibing

2026-04-24 3ae3285458b1d603cb0e7bc3395b7062f4eea8f0

Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCouponController.java

@@ -305,10 +305,10 @@
    }


    @PostMapping("/api/v1/appUserCoupon/saveInfo")
    @PostMapping("/api/v1/appUserCoupon/saveInfo_activity")
    @ApiOperation(value = "活动发放优惠券", tags = {"管理后台-活动发放优惠券"})
    public R<String> sendSave(@RequestBody UseUserCouponDto dto) {
        xpAppUserCouponService.saveInfo(dto);
    public R<String> saveInfo_activity(@RequestBody UseUserCouponDto dto) {
        xpAppUserCouponService.saveInfo_activity(dto);
        return R.ok();
    }
    /**

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/IXpAppUserCouponService.java

@@ -71,8 +71,9 @@
     */
    NavigationCouponPickerVo navigationCouponPicker(Long userId, NavigationCouponPickerRequest request);


    @Async("couponSendExecutor")
    boolean saveInfo(UseUserCouponDto dto);
    boolean saveInfo_activity(UseUserCouponDto dto);

    /**
     * 发送优惠券

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCouponServiceImpl.java

@@ -208,7 +208,7 @@

    @Async("couponSendExecutor")
    @Override
    public boolean saveInfo(UseUserCouponDto dto) {
    public boolean saveInfo_activity(UseUserCouponDto dto) {
        R<XpCoupon> coupon = xpCouponClient.getCouponById(dto.getCouponId());
        if (coupon != null) {
            XpCoupon xpCoupon = coupon.getData();
@@ -229,7 +229,19 @@
                xpAppUserCoupon.setOpenCityId("0");
                xpAppUserCoupon.setTimeJson("[{\"time\": [\"00:00-23:59\"], \"type\": 3, \"typeStr\": 0}]");
                baseMapper.insert(xpAppUserCoupon);
                sendMsg(xpAppUserCoupon.getAppUserId(), xpCoupon, xpAppUserCoupon.getExpirationTime());


                //发送微信通知
                SendSubscribeMessageVo vo = new SendSubscribeMessageVo();
                vo.setUserId(xpAppUserCoupon.getAppUserId());
                vo.setTemplateId(MessageTemplateEnum.B.getTemplateId());
                String json = MessageTemplateEnum.B.getRemarks();
                json = json.replace("活动名称", dto.getActivityName());
                json = json.replace("开始时间", dto.getActivityStartTime().toString() );
                json = json.replace("结束时间", dto.getActivityEndTime().toString() );
                json = json.replace("温馨提示", dto.getActivityRemarks());
                vo.setJson(json);
                subscribeMessageClient.sendSubscribeMessage(vo);
            }
        }
        return true;

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/account/UseUserCouponDto.java

@@ -6,6 +6,7 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;
import java.util.List;

@Data
@@ -37,4 +38,13 @@

    @ApiModelProperty(value = "活动id")
    private Long activityId;
    @ApiModelProperty(value = "活动名称")
    private String activityName;
    @ApiModelProperty(value = "活动开始时间")
    private LocalDateTime activityStartTime;
    @ApiModelProperty(value = "活动开始时间")
    private LocalDateTime activityEndTime;
    @ApiModelProperty(value = "活动备注")
    private String activityRemarks;

}

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/account/XpAppUserCouponClientFallbackFactory.java

@@ -53,7 +53,7 @@
            }

            @Override
            public R<String> sendSave(UseUserCouponDto dto) {
            public R<String> saveInfo_activity(UseUserCouponDto dto) {
                log.error("优惠券服务繁忙，原因: {}", cause.getMessage());
                return null;
            }

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/XpAppUserCouponClient.java

@@ -45,12 +45,12 @@


    /**
     * userIds 、couponId、activityId
     * userIds 、couponId、activityId、activityName、activityStartTime、activityEndTime、activityRemarks
     * @param dto
     * @return
     */
    @PostMapping("/api/v1/appUserCoupon/saveInfo")
    @PostMapping("/api/v1/appUserCoupon/saveInfo_activity")
    @ApiOperation(value = "活动发放优惠券", tags = {"管理后台-活动发放优惠券"})
     R<String> sendSave(@RequestBody UseUserCouponDto dto) ;
     R<String> saveInfo_activity(@RequestBody UseUserCouponDto dto) ;

}