推广人 功能修复

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -1235,11 +1235,11 @@ public class FsUserServiceImpl implements IFsUserService {
                 if (tuiUser != null) {
                     FsUser tuiUserMap = new FsUser();
                     tuiUserMap.setUserId(tuiUser.getUserId());
-                    tuiUserMap.setNowMoney(tuiUser.getNowMoney().add(new BigDecimal(bill.getNumber())));
-                    tuiUserMap.setBrokeragePrice(tuiUser.getBrokeragePrice().subtract(new BigDecimal(bill.getNumber())));
+                    tuiUserMap.setNowMoney(tuiUser.getNowMoney().add(bill.getMoney()));
+                    tuiUserMap.setBrokeragePrice(tuiUser.getBrokeragePrice().subtract(bill.getMoney()));
                     fsUserMapper.updateFsUser(tuiUserMap);
-                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_3.getValue(), 0, BillDetailEnum.TYPE_6.getDesc(), bill.getNumber().doubleValue(), tuiUserMap.getBrokeragePrice().doubleValue(), "订单分佣金", order.getId().toString(), bill.getTuiUserId());
-                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_1.getValue(), 1, BillDetailEnum.TYPE_5.getDesc(), bill.getNumber().doubleValue(), tuiUserMap.getNowMoney().doubleValue(), "订单分佣金", order.getId().toString(), bill.getTuiUserId());
+                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_3.getValue(), 0, BillDetailEnum.TYPE_6.getDesc(), bill.getMoney(), tuiUserMap.getBrokeragePrice(), "订单分佣金", order.getId().toString(), bill.getTuiUserId());
+                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_1.getValue(), 1, BillDetailEnum.TYPE_5.getDesc(), bill.getMoney(), tuiUserMap.getNowMoney(), "订单分佣金", order.getId().toString(), bill.getTuiUserId());
                 }
             }
         }

fs-service/src/main/java/com/fs/hisStore/domain/FsUserBillScrm.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 
+import java.math.BigDecimal;
+
 /**
  * 用户账单对象 fs_user_bill
  *
@@ -46,9 +48,12 @@ public class FsUserBillScrm extends BaseEntity
     @Excel(name = "明细数字")
     private Double number;
 
+    @Excel(name = "金额")
+    private BigDecimal money;
+
     /** 剩余 */
     @Excel(name = "剩余")
-    private Double balance;
+    private BigDecimal balance;
 
     /** 0 = 带确定 1 = 有效 -1 = 无效 */
     @Excel(name = "0 = 带确定 1 = 有效 -1 = 无效")
@@ -56,6 +61,15 @@ public class FsUserBillScrm extends BaseEntity
 
     private Long tuiUserId;
 
+
+    public BigDecimal getMoney() {
+        return money;
+    }
+
+    public void setMoney(BigDecimal money) {
+        this.money = money;
+    }
+
     public Long getTuiUserId() {
         return tuiUserId;
     }
@@ -133,11 +147,11 @@ public class FsUserBillScrm extends BaseEntity
         this.number = number;
     }
 
-    public Double getBalance() {
+    public BigDecimal getBalance() {
         return balance;
     }
 
-    public void setBalance(Double balance) {
+    public void setBalance(BigDecimal balance) {
         this.balance = balance;
     }
 

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -511,7 +511,7 @@ public interface FsStoreOrderScrmMapper
     @Select({"<script> " +
             "select b.number as tui_price,b.bill_type,b.create_time,o.id as order_id,o.order_code,o.pay_price,u.nickname,u.avatar from fs_user_bill b inner join  fs_store_order_scrm o on b.business_id=o.id left join fs_user u on u.user_id=o.user_id  " +
             "where b.user_id=#{userId} and b.category='brokerage_price'   " +
-            " order by b.id desc"+
+            " order by b.bill_id desc"+
             "</script>"})
     List<FsStoreOrderTuiVO> selectFsStoreOrderTuiListVO(String userId);
     @Select({"<script> " +

fs-service/src/main/java/com/fs/hisStore/service/IFsUserBillScrmService.java

@@ -9,7 +9,7 @@ import com.fs.hisStore.vo.FsUserBillVO;
 
 /**
  * 用户账单Service接口
- * 
+ *
  * @author fs
  * @date 2022-04-03
  */
@@ -17,7 +17,7 @@ public interface IFsUserBillScrmService
 {
     /**
      * 查询用户账单
-     * 
+     *
      * @param id 用户账单ID
      * @return 用户账单
      */
@@ -25,7 +25,7 @@ public interface IFsUserBillScrmService
 
     /**
      * 查询用户账单列表
-     * 
+     *
      * @param fsUserBill 用户账单
      * @return 用户账单集合
      */
@@ -33,7 +33,7 @@ public interface IFsUserBillScrmService
 
     /**
      * 新增用户账单
-     * 
+     *
      * @param fsUserBill 用户账单
      * @return 结果
      */
@@ -41,7 +41,7 @@ public interface IFsUserBillScrmService
 
     /**
      * 修改用户账单
-     * 
+     *
      * @param fsUserBill 用户账单
      * @return 结果
      */
@@ -49,7 +49,7 @@ public interface IFsUserBillScrmService
 
     /**
      * 批量删除用户账单
-     * 
+     *
      * @param ids 需要删除的用户账单ID
      * @return 结果
      */
@@ -57,13 +57,13 @@ public interface IFsUserBillScrmService
 
     /**
      * 删除用户账单信息
-     * 
+     *
      * @param id 用户账单ID
      * @return 结果
      */
     public int deleteFsUserBillById(Long id);
 
-    void addBill(Long uid,String cate,Integer billType, String title, double number, double balance, String remark,String busId,Long tuiUserId);
+    void addBill(Long uid,String cate,Integer billType, String title, BigDecimal number, BigDecimal balance, String remark,String busId,Long tuiUserId);
 
 
     List<FsUserBillScrm> selectFsUserBillListQuery(FsUserBillQueryParam param);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -905,7 +905,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             }
             //使用了积分扣积分
             if (dto.getUsedIntegral() > 0) {
-                this.decIntegral(userId, dto.getUsedIntegral(), dto.getDeductionPrice().doubleValue(), storeOrder.getId().toString());
+                this.decIntegral(userId, dto.getUsedIntegral(), dto.getDeductionPrice(), storeOrder.getId().toString());
             }
             //减库存加销量
             this.deStockIncSale(carts);
@@ -1109,11 +1109,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     /**
      * 积分抵扣
      */
-    private void decIntegral(Long uid, double usedIntegral, double deductionPrice, String busId) {
+    private void decIntegral(Long uid, double usedIntegral, BigDecimal deductionPrice, String busId) {
         userService.decIntegral(uid, usedIntegral);
         FsUserScrm user = userService.selectFsUserById(uid);
         //积分记录
-        billService.addBill(uid, BillDetailEnum.CATEGORY_2.getValue(), 0, BillDetailEnum.TYPE_1.getDesc(), usedIntegral, user.getIntegral().doubleValue(),
+        billService.addBill(uid, BillDetailEnum.CATEGORY_2.getValue(), 0, BillDetailEnum.TYPE_1.getDesc(), new BigDecimal(usedIntegral) ,new BigDecimal(user.getIntegral()),
                 "购买商品使用" + usedIntegral + "积分抵扣" + deductionPrice + "元", busId, 0l);
 
     }
@@ -2782,8 +2782,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         userService.updateFsUser(user);
         //增加流水
         billService.addBill(user.getUserId(), BillDetailEnum.CATEGORY_2.getValue(), 1, BillDetailEnum.TYPE_5.getDesc(),
-                order.getUseIntegral().doubleValue(),
-                newIntegral.doubleValue(),
+                order.getUseIntegral(),
+                newIntegral,
                 "购买商品失败,回退积分" + order.getUseIntegral(), order.getId().toString(), 0l);
         //更新订单回退积分
         FsStoreOrderScrm storeOrder = new FsStoreOrderScrm();

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserBillScrmServiceImpl.java

@@ -109,13 +109,14 @@ public class FsUserBillScrmServiceImpl implements IFsUserBillScrmService
     }
 
     @Override
-    public void addBill(Long uid, String cate,Integer billType,String title, double number, double balance, String renark,String busId,Long tuiUserId) {
+    public void addBill(Long uid, String cate,Integer billType,String title, BigDecimal money, BigDecimal balance, String renark,String busId,Long tuiUserId) {
         FsUserBillScrm bill=new FsUserBillScrm();
         bill.setCategory(cate);
         bill.setBillType(billType);
         bill.setUserId(uid);
         bill.setTitle(title);
-        bill.setNumber(number);
+//        bill.setNumber(number);
+        bill.setMoney(money);
         bill.setBalance(balance);
         bill.setRemark(renark);
         bill.setBusinessId(busId);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserExtractScrmServiceImpl.java

@@ -22,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 用户提现Service业务层处理
- * 
+ *
  * @author fs
  * @date 2022-03-15
  */
@@ -37,7 +37,7 @@ public class FsUserExtractScrmServiceImpl implements IFsUserExtractScrmService
     private IFsUserBillScrmService billService;
     /**
      * 查询用户提现
-     * 
+     *
      * @param id 用户提现ID
      * @return 用户提现
      */
@@ -49,7 +49,7 @@ public class FsUserExtractScrmServiceImpl implements IFsUserExtractScrmService
 
     /**
      * 查询用户提现列表
-     * 
+     *
      * @param fsUserExtract 用户提现
      * @return 用户提现
      */
@@ -61,7 +61,7 @@ public class FsUserExtractScrmServiceImpl implements IFsUserExtractScrmService
 
     /**
      * 新增用户提现
-     * 
+     *
      * @param fsUserExtract 用户提现
      * @return 结果
      */
@@ -74,7 +74,7 @@ public class FsUserExtractScrmServiceImpl implements IFsUserExtractScrmService
 
     /**
      * 修改用户提现
-     * 
+     *
      * @param fsUserExtract 用户提现
      * @return 结果
      */
@@ -87,7 +87,7 @@ public class FsUserExtractScrmServiceImpl implements IFsUserExtractScrmService
 
     /**
      * 批量删除用户提现
-     * 
+     *
      * @param ids 需要删除的用户提现ID
      * @return 结果
      */
@@ -99,7 +99,7 @@ public class FsUserExtractScrmServiceImpl implements IFsUserExtractScrmService
 
     /**
      * 删除用户提现信息
-     * 
+     *
      * @param id 用户提现ID
      * @return 结果
      */
@@ -139,7 +139,7 @@ public class FsUserExtractScrmServiceImpl implements IFsUserExtractScrmService
         fsUserExtractMapper.insertFsUserExtract(extract);
         userMapper.updateFsUser(user);
         //插入流水
-        billService.addBill(user.getUserId(), BillDetailEnum.CATEGORY_1.getValue(),0,BillDetailEnum.TYPE_6.getDesc(),param.getExtractPrice().doubleValue(),user.getNowMoney().doubleValue(),"提现申请",extract.getId().toString(),0l);
+        billService.addBill(user.getUserId(), BillDetailEnum.CATEGORY_1.getValue(),0,BillDetailEnum.TYPE_6.getDesc(),param.getExtractPrice(),user.getNowMoney(),"提现申请",extract.getId().toString(),0l);
 
         return R.ok("提交成功,等待后台审核");
     }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserScrmServiceImpl.java

@@ -328,7 +328,7 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
                     tuiUserMap.setUserId(tuiUser.getUserId());
                     tuiUserMap.setBrokeragePrice(tuiUser.getBrokeragePrice().add(brokerage));
                     fsUserMapper.updateFsUser(tuiUserMap);
-                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_3.getValue(),1,BillDetailEnum.TYPE_5.getDesc(),brokerage.doubleValue(),tuiUserMap.getBrokeragePrice().doubleValue(),"订单返佣金",order.getId().toString(),order.getUserId());
+                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_3.getValue(),1,BillDetailEnum.TYPE_5.getDesc(),brokerage,tuiUserMap.getBrokeragePrice(),"订单返佣金",order.getId().toString(),order.getUserId());
                 }
             }
             //二级返
@@ -340,7 +340,7 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
                         tuiUserTwoMap.setUserId(tuiUserTwo.getUserId());
                         tuiUserTwoMap.setBrokeragePrice(tuiUserTwo.getBrokeragePrice().add(brokerageTwo));
                         fsUserMapper.updateFsUser(tuiUserTwoMap);
-                        billService.addBill(tuiUserTwoMap.getUserId(), CATEGORY_3.getValue(),1,BillDetailEnum.TYPE_5.getDesc(),brokerageTwo.doubleValue(),tuiUserTwoMap.getBrokeragePrice().doubleValue(),"订单返佣金",order.getId().toString(),tuiUser.getUserId());
+                        billService.addBill(tuiUserTwoMap.getUserId(), CATEGORY_3.getValue(),1,BillDetailEnum.TYPE_5.getDesc(),brokerageTwo,tuiUserTwoMap.getBrokeragePrice(),"订单返佣金",order.getId().toString(),tuiUser.getUserId());
                     }
                     //三级
                     FsUserScrm tuiUserThree= fsUserMapper.selectFsUserById(tuiUserTwo.getSpreadUserId());
@@ -350,7 +350,7 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
                             tuiUserThreeMap.setUserId(tuiUserThree.getUserId());
                             tuiUserThreeMap.setBrokeragePrice(tuiUserThree.getBrokeragePrice().add(brokerageThree));
                             fsUserMapper.updateFsUser(tuiUserThreeMap);
-                            billService.addBill(tuiUserThreeMap.getUserId(), CATEGORY_3.getValue(),1,BillDetailEnum.TYPE_5.getDesc(),brokerageThree.doubleValue(),tuiUserThreeMap.getBrokeragePrice().doubleValue(),"订单返佣金",order.getId().toString(),tuiUser.getUserId());
+                            billService.addBill(tuiUserThreeMap.getUserId(), CATEGORY_3.getValue(),1,BillDetailEnum.TYPE_5.getDesc(),brokerageThree,tuiUserThreeMap.getBrokeragePrice(),"订单返佣金",order.getId().toString(),tuiUser.getUserId());
                         }
 
                     }
@@ -377,9 +377,9 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
                 if(tuiUser!=null){
                     FsUserScrm tuiUserMap=new FsUserScrm();
                     tuiUserMap.setUserId(tuiUser.getUserId());
-                    tuiUserMap.setBrokeragePrice(tuiUser.getBrokeragePrice().subtract(new BigDecimal(bill.getNumber())));
+                    tuiUserMap.setBrokeragePrice(tuiUser.getBrokeragePrice().subtract(bill.getMoney()));
                     fsUserMapper.updateFsUser(tuiUserMap);
-                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_3.getValue(),0,BillDetailEnum.TYPE_6.getDesc(),bill.getNumber().doubleValue(),tuiUserMap.getBrokeragePrice().doubleValue(),"订单退佣金",order.getId().toString(),bill.getTuiUserId());
+                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_3.getValue(),0,BillDetailEnum.TYPE_6.getDesc(),bill.getMoney(),tuiUserMap.getBrokeragePrice(),"订单退佣金",order.getId().toString(),bill.getTuiUserId());
                 }
             }
         }
@@ -400,11 +400,11 @@ public class FsUserScrmServiceImpl implements IFsUserScrmService
                 if(tuiUser!=null){
                     FsUserScrm tuiUserMap=new FsUserScrm();
                     tuiUserMap.setUserId(tuiUser.getUserId());
-                    tuiUserMap.setNowMoney(tuiUser.getNowMoney().add(new BigDecimal(bill.getNumber())));
-                    tuiUserMap.setBrokeragePrice(tuiUser.getBrokeragePrice().subtract(new BigDecimal(bill.getNumber())));
+                    tuiUserMap.setNowMoney(tuiUser.getNowMoney().add(bill.getMoney()));
+                    tuiUserMap.setBrokeragePrice(tuiUser.getBrokeragePrice().subtract(bill.getMoney()));
                     fsUserMapper.updateFsUser(tuiUserMap);
-                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_3.getValue(),0,BillDetailEnum.TYPE_6.getDesc(),bill.getNumber().doubleValue(),tuiUserMap.getBrokeragePrice().doubleValue(),"订单分佣金",order.getId().toString(),bill.getTuiUserId());
-                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_1.getValue(),1,BillDetailEnum.TYPE_5.getDesc(),bill.getNumber().doubleValue(),tuiUserMap.getNowMoney().doubleValue(),"订单分佣金",order.getId().toString(),bill.getTuiUserId());
+                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_3.getValue(),0,BillDetailEnum.TYPE_6.getDesc(),bill.getMoney(),tuiUserMap.getBrokeragePrice(),"订单分佣金",order.getId().toString(),bill.getTuiUserId());
+                    billService.addBill(tuiUserMap.getUserId(), CATEGORY_1.getValue(),1,BillDetailEnum.TYPE_5.getDesc(),bill.getMoney(),tuiUserMap.getNowMoney(),"订单分佣金",order.getId().toString(),bill.getTuiUserId());
                 }
             }
         }

fs-service/src/main/resources/mapper/hisStore/FsUserBillScrmMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.fs.hisStore.mapper.FsUserBillScrmMapper">
 
     <resultMap type="FsUserBillScrm" id="FsUserBillResult">
-        <result property="bill_id"    column="id"    />
+        <result property="billId"    column="bill_id"    />
         <result property="userId"    column="user_id"    />
         <result property="businessId"    column="business_id"    />
         <result property="category"    column="category"    />
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where bill_id = #{id}
     </select>
 
-    <insert id="insertFsUserBill" parameterType="FsUserBillScrm" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertFsUserBill" parameterType="FsUserBillScrm" useGeneratedKeys="true" keyProperty="billId">
         insert into fs_user_bill
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>