Merge branch 'txb'

tangxiaobao

2021-08-18 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java

@@ -305,6 +305,9 @@
                if(cmActEasyPhotoDO.getStatus().equals(ComActEasyPhotoDO.status.dsh)){
                    cmActEasyPhotoDO.setExamineAt(nowDate);
                    cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getUserId());
                    cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
                    //审核通过判断随手拍是否有活动并计算用户收益
                    comActUserWalletService.examineAddMoney(comActEasyPhotoVO.getActivityType(),comActEasyPhotoVO.getId(),comActEasyPhotoVO.getUserId(),BigDecimal.ZERO);
                }
                cmActEasyPhotoDO.setFeedbackAt(nowDate);
                cmActEasyPhotoDO.setStatus(ComActEasyPhotoDO.status.ywc);