账单列表金额单位转换

ch-admin-api/src/main/java/com/wwdz/ch/admin/entity/vo/UserBillVo.java

@@ -43,34 +43,34 @@ public class UserBillVo implements Entity {
      * 总入账金额
      */
     @ExcelProperty(value = "转账金额", index = 6)
-    private Long totalEntryAmount;
+    private String totalEntryAmount;
 
     /**
      * 总待入账金额
      */
-    private Long totalWaitEntryAmount;
+    private String totalWaitEntryAmount;
 
     /**
      * 订单入账金额
      */
     @ExcelProperty(value = "订单收入", index = 7)
-    private Long orderEntryAmount;
+    private String orderEntryAmount;
 
     /**
      * 订单待入账金额
      */
-    private Long orderWaitEntryAmount;
+    private String orderWaitEntryAmount;
 
     /**
      * 介绍佣金入账金额
      */
     @ExcelProperty(value = "介绍佣金", index = 8)
-    private Long introduceEntryAmount;
+    private String introduceEntryAmount;
 
     /**
      * 介绍佣金待入账金额
      */
-    private Long introduceWaitEntryAmount;
+    private String introduceWaitEntryAmount;
 
     /**
      * 创建时间

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysFinanceServiceImpl.java

@@ -155,6 +155,12 @@ public class SysFinanceServiceImpl implements SysFinanceService {
                 EntityMapper.copyAttribute(userBill, userBillVo);
                 userBillVo.setAccountPeriod(userBill.getAccountPeriod());
                 userBillVo.setUserName(cacheUtil.appletUserInfoCache.get(userBill.getUserId()).get().getNickname());
+                userBillVo.setTotalEntryAmount(PriceUtil.convertPriceFenToYuan(userBill.getTotalEntryAmount()));
+                userBillVo.setTotalWaitEntryAmount(PriceUtil.convertPriceFenToYuan(userBill.getTotalWaitEntryAmount()));
+                userBillVo.setOrderEntryAmount(PriceUtil.convertPriceFenToYuan(userBill.getOrderEntryAmount()));
+                userBillVo.setOrderWaitEntryAmount(PriceUtil.convertPriceFenToYuan(userBill.getOrderWaitEntryAmount()));
+                userBillVo.setIntroduceEntryAmount(PriceUtil.convertPriceFenToYuan(userBill.getIntroduceEntryAmount()));
+                userBillVo.setIntroduceWaitEntryAmount(PriceUtil.convertPriceFenToYuan(userBill.getIntroduceWaitEntryAmount()));
                 //查询银行卡信息
                 UserBankCard userBankCard = userBankCardDao.findById(userBill.getUserId());
                 if (userBankCard != null) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java

@@ -546,8 +546,8 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             if (itemId == null) {
                 return Result.failed("没有对应的商品id");
             }
-
-            if (collectionShareRecord.getItemUserId().longValue() != dto.getUserId().longValue()) {
+           // collectionShareRecord.getItemUserId()
+            if (collectionShareRecord != null && collectionShareRecord.getItemUserId().longValue() != dto.getUserId().longValue()) {
                 //客态进入别人的藏馆，自动关注
                 FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
                 followFansRecordRequestDto.setFollowerId(collectionShareRecord.getItemUserId());
@@ -838,7 +838,7 @@ public class SupplierItemServiceImpl implements SupplierItemService {
             } else {
                 collectionShareRecord = collectionShareRecordDao.findById(dto.getShareRecordId());
                 itemId = collectionShareRecord.getShareTargetId();
-                if (collectionShareRecord.getItemUserId().longValue() != dto.getUserId().longValue()) {
+                if (collectionShareRecord != null && collectionShareRecord.getItemUserId().longValue() != dto.getUserId().longValue()) {
                     //客态进入别人的藏馆，自动关注
                     FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
                     followFansRecordRequestDto.setFollowerId(collectionShareRecord.getItemUserId());
@@ -876,9 +876,9 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                     }
                     return Result.failed("该藏品已删除");
                 }
-                //如果是客态，则自动关注该用户
+               /* //如果是客态，则自动关注该用户
                 if (StringUtils.hasLength(dto.getShareRecordId())) {
-                    if (collectionShareRecord.getItemUserId().longValue() != dto.getUserId().longValue()) {
+                    if (collectionShareRecord != null && collectionShareRecord.getItemUserId().longValue() != dto.getUserId().longValue()) {
                         FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
                         followFansRecordRequestDto.setFollowerId(collectionShareRecord.getItemUserId());
                         followFansRecordRequestDto.setFansId(dto.getUserId());
@@ -886,7 +886,16 @@ public class SupplierItemServiceImpl implements SupplierItemService {
                         followFansRecordService.follow(followFansRecordRequestDto);
                         logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
                     }
-                }
+                } else {
+                    if (supplierItem.getCreatorId().longValue() != dto.getUserId().longValue()) {
+                        FollowFansRecordRequestDto followFansRecordRequestDto = new FollowFansRecordRequestDto();
+                        followFansRecordRequestDto.setFollowerId(collectionShareRecord.getItemUserId());
+                        followFansRecordRequestDto.setFansId(dto.getUserId());
+                        followFansRecordRequestDto.setIntroducerId(CommConsts.SYSTEM_ACCOUNT);
+                        followFansRecordService.follow(followFansRecordRequestDto);
+                        logger.info("用户id:{} 关注了 用户id为 {}， 介绍人为", dto.getUserId(), collectionShareRecord.getItemUserId(), collectionShareRecord.getSharerId());
+                    }
+                }*/
                 //返回用户二维码
                 User user = cacheUtil.appletUserInfoCache.get(supplierItem.getCreatorId()).get();
                 if (user != null) {