移除无用VO及其其他

yshop-mall/src/main/java/co/yixiang/modules/manage/service/YxExpressService.java

@@ -1,43 +0,0 @@
-///**
-// * Copyright (C) 2018-2020
-// * All rights reserved, Designed By www.yixiang.co
-// * 注意：
-// * 本软件为www.yixiang.co开发研制，未经购买不得使用
-// * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台）
-// * 一经发现盗用、分享等行为，将追究法律责任，后果自负
-// */
-//package co.yixiang.modules.manage.service;
-//
-//import co.yixiang.commonold.service.BaseService;
-//import co.yixiang.commonold.web.vo.Paging;
-//import co.yixiang.modules.manage.entity.YxExpress;
-//import co.yixiang.modules.manage.web.param.YxExpressQueryParam;
-//import co.yixiang.modules.manage.web.vo.YxExpressQueryVo;
-//
-//import java.io.Serializable;
-//
-///**
-// * <p>
-// * 快递公司表 服务类
-// * </p>
-// *
-// * @author hupeng
-// * @since 2019-12-13
-// */
-//public interface YxExpressService extends BaseService<YxExpress> {
-//
-//    /**
-//     * 根据ID获取查询对象
-//     * @param id
-//     * @return
-//     */
-//    YxExpressQueryVo getYxExpressById(Serializable id);
-//
-//    /**
-//     * 获取分页对象
-//     * @param yxExpressQueryParam
-//     * @return
-//     */
-//    Paging<YxExpressQueryVo> getYxExpressPageList(YxExpressQueryParam yxExpressQueryParam) throws Exception;
-//
-//}

yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserRechargeServiceImpl.java

@@ -83,20 +83,13 @@ public class YxUserRechargeServiceImpl extends BaseServiceImpl<UserRechargeMappe
 
         //最终充值金额
         BigDecimal newPrice = NumberUtil.add(userRecharge.getPrice(),user.getNowMoney());
-       // newPrice = NumberUtil.add(userRecharge.getGivePrice(),newPrice);
+
+
         //增加流水
-        YxUserBill userBill = new YxUserBill();
-        userBill.setUid(userRecharge.getUid());
-        userBill.setTitle("用户余额充值");
-        userBill.setLinkId(userRecharge.getId().toString());
-        userBill.setCategory(BillDetailEnum.CATEGORY_1.getValue());
-        userBill.setType(BillDetailEnum.TYPE_1.getValue());
-        userBill.setNumber(userRecharge.getPrice());
-        userBill.setBalance(newPrice);
-        userBill.setMark("成功充值余额"+userRecharge.getPrice());
-        userBill.setStatus(BillEnum.STATUS_1.getValue());
-        userBill.setPm(BillEnum.PM_1.getValue());
-        billService.save(userBill);
+        billService.income(userRecharge.getUid(),"用户余额充值",BillDetailEnum.CATEGORY_1.getValue(),
+                BillDetailEnum.TYPE_1.getValue(),userRecharge.getPrice().doubleValue(),newPrice.doubleValue(),
+                "成功充值余额"+userRecharge.getPrice(),userRecharge.getId().toString());
+
 
         //update 余额
         user.setNowMoney(newPrice);