lidongdong
2023-11-24 45d128242932fc84b559aec4579a2aa221555cb4
修改小程序下单3
2个文件已修改
28 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserNoticeVO.java
@@ -33,7 +33,7 @@
    @ApiModelProperty("消息标题")
    private String title;
    @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知 11 党员认证审核通知 12邻里圈审核通知 13 高龄认证社区反馈通知")
    @ApiModelProperty("具体业务类型 1 社区活动 2党建活动 3微心愿通知 4随手拍服务通知 5支援者申请 6实名制审核 7人脸识别审核 8积分获取和消耗 9积分点击直接跳转积分列表 10 房屋审核通知 11 党员认证审核通知 12邻里圈审核通知 13 高龄认证社区反馈通知   14线下商家订单")
    private Integer businessType;
    @ApiModelProperty("业务标题")
@@ -63,7 +63,7 @@
    @ApiModelProperty("业务主键 用于跳转")
    private Long businessId;
    @ApiModelProperty("社区活动类型 1志愿者活动 2居民活动 3党建活动")
    @ApiModelProperty("社区活动类型 1志愿者活动 2居民活动 3党建活动 4 商家线下积分兑换")
    private Integer activityType;
}
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java
@@ -1,11 +1,14 @@
package com.panzhihua.service_dangjian.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.partybuilding.NewFightIntegral;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.building.NewFightShoppingOrderVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_dangjian.dao.NewFightShoppingOrderDao;
import com.panzhihua.service_dangjian.entity.ComActIntegralUser;
@@ -32,6 +35,9 @@
    @Resource
    private ComActIntegralUsersService integralUsersService;
    @Resource
    private UserService userService;
    @Override
    public R getList(int pageNum,int pageSize,String userId,String goodsId,String orderNumber,
@@ -115,6 +121,24 @@
                integral.setRemark("商家兑换商品");
                integral.setMerchantId(item.getMerchantId());
                integral.setIntegralNum(item.getPalyMoney());
                SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
                sysUserNoticeVO.setUserId(Long.valueOf(item.getUserId()));
                sysUserNoticeVO.setType(1);
                sysUserNoticeVO.setTitle("商家兑换成功");
                sysUserNoticeVO.setBusinessType(14);
                sysUserNoticeVO.setBusinessTitle(item.getRemark());
                sysUserNoticeVO
                        .setBusinessContent(String.format("兑换商品%s", item.getRemark()));
                sysUserNoticeVO.setStatus(0);
                sysUserNoticeVO.setBusinessStatus(1);
                sysUserNoticeVO.setActivityType(4);
                R r2 = userService.addNotice(sysUserNoticeVO);
//                if (R.isOk(r2)) {
//                    log.info("新增兑换商品通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
//                }
            }
            integralUsersService.upIntegral(integral);