Merge remote-tracking branch 'origin/master'

src/main/java/org/rcisoft/alibaba/faceVerify/service/impl/FaceVerifyServiceImpl.java

@@ -14,6 +14,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.rcisoft.alibaba.faceVerify.bean.FaceVerifyAliComp;
 import org.rcisoft.alibaba.faceVerify.bean.FaceVerifyRedisBean;
 import org.rcisoft.alibaba.faceVerify.service.FaceVerifyService;
+import org.rcisoft.business.memGoldCoinFlow.dao.MemGoldCoinFlowRepository;
+import org.rcisoft.business.memGoldCoinFlow.entity.MemGoldCoinFlow;
 import org.rcisoft.business.memInfo.dao.MemInfoRepository;
 import org.rcisoft.business.memInfo.entity.MemInfo;
 import org.rcisoft.core.exception.CyServiceException;
@@ -23,6 +25,8 @@ import org.rcisoft.core.util.CyAESUtils;
 import org.rcisoft.core.util.CyAddressUtils;
 import org.rcisoft.core.util.CyUserUtil;
 import org.rcisoft.core.util.TimeUtil;
+import org.rcisoft.sys.dictionary.entity.DictData;
+import org.rcisoft.sys.dictionary.service.impl.DictionaryServiceImpl;
 import org.rcisoft.sys.rbac.user.dao.SysUserRbacRepository;
 import org.rcisoft.sys.rbac.user.entity.SysUserRbac;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +55,10 @@ public class FaceVerifyServiceImpl extends ServiceImpl<MemInfoRepository, MemInf
     private CyRedisService cyRedisServiceImpl;
     @Autowired
     private SysUserRbacRepository sysUserRbacRepository;
+    @Autowired
+    private DictionaryServiceImpl dictionaryService;
+    @Autowired
+    private MemGoldCoinFlowRepository memGoldCoinFlowRepository;
     /**
      * 发起认证请求
      * @param memInfo
@@ -215,15 +223,28 @@ public class FaceVerifyServiceImpl extends ServiceImpl<MemInfoRepository, MemInf
                     map.put("passed", response.getBody().getResultObject().getPassed());
                     map.put("subCode", response.getBody().getResultObject().getSubCode());
                     if ("T".equals(response.getBody().getResultObject().getPassed())) {
+                        List<DictData> userConfig = dictionaryService.selectByTypes("user_config");
+                        DictData dictData = userConfig.stream().filter(item -> item.getDictLabel().equals("real_auth_coin_count")).findFirst().orElse(null);
+                        Integer coinCount = Integer.valueOf(dictData.getDictValue());
                         memInfo.setMemRealAuthen("1");
                         memInfo.setMemRealAuthenDate(new Date());
                         memInfo.setMemIdcard(CyAESUtils.encrypt(idCard));
                         memInfo.setMemRealName(CyAESUtils.encrypt(realName));
+                        memInfo.setGoldCoinsCount(coinCount);
                         memInfoRepository.updateById(memInfo);
                         //修改sys_user
                         SysUserRbac userRbac = sysUserRbacRepository.selectById(memInfo.getUserId());
                         userRbac.setIdNumber(memInfo.getMemIdcard());
                         sysUserRbacRepository.updateById(userRbac);
+                        //增加金币流水记录
+                        MemGoldCoinFlow memGoldCoinFlow = new MemGoldCoinFlow();
+                        memGoldCoinFlow.setCreateBy(userId);
+                        memGoldCoinFlow.setUpdateBy(userId);
+                        memGoldCoinFlow.setCount(coinCount);
+                        memGoldCoinFlow.setEndCount(coinCount);
+                        memGoldCoinFlow.setType("1");
+                        memGoldCoinFlow.setActionType("12");
+                        memGoldCoinFlowRepository.insert(memGoldCoinFlow);
                     } else {
                         HttpServletRequest request1 = ((ServletRequestAttributes) (RequestContextHolder.getRequestAttributes())).getRequest();
                         String ip = CyAddressUtils.IpUtils.getIpAddr(request1);

src/main/java/org/rcisoft/baidu/censor/dto/CensorResult.java

@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
@@ -17,7 +19,7 @@ public class CensorResult {
     /**
      * 审核失败原因
      */
-    String errorMsg;
+    List<String> errorMsg;
 
 }
 

src/main/java/org/rcisoft/baidu/censor/service/impl/ContentCensorServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -93,7 +94,7 @@ public class ContentCensorServiceImpl implements ContentCensorService {
         //获取代表审核结果的字段
         //审核结果类型，可取值1.合规，2.不合规，3.疑似，4.审核失败
         int conclusionType = 4;
-
+        List<String> error = new ArrayList<>();
         //如果是null就直接判定为失败
         if (clientJsonObject != null) {
             try {
@@ -101,21 +102,20 @@ public class ContentCensorServiceImpl implements ContentCensorService {
                 log.info("审核结果"+clientJsonObject.getString(CENSOR_CONCLUSION_KEY));
                 log.info("请求唯一id"+clientJsonObject.getString(CENSOR_LOG_ID_KEY));
                 boolean isPass = conclusionType == 1;
-                List<String> msg = new ArrayList<>();
                 if (clientJsonObject.has("data")) {
                     JSONArray array = clientJsonObject.getJSONArray("data");
                     for (int i = 0; i < array.length(); i++) {
-                        cn.hutool.json.JSONObject json = JSONUtil.parseObj(array.get(i).toString());
-                        msg.add(json.getStr("msg"));
+                        error.add(array.get(i).toString());
                     }
                 }
-                return new CensorResult(isPass, String.join("，", msg)  );
+                return new CensorResult(isPass, error);
             } catch (JSONException e) {
                 log.error(""+e);
-                return new CensorResult(false, "获取审核结果失败");
+                String json = "{\"msg\":\"获取审核结果失败\"}";
+                return new CensorResult(false, Arrays.asList(json));
             }
         } else
-            return new CensorResult(false, "获取审核结果失败");
+            return new CensorResult(false, Arrays.asList("{\"msg\":\"获取审核结果失败\"}"));
 
     }
 

src/main/java/org/rcisoft/business/memGoldCoinFlow/entity/MemGoldCoinFlow.java

@@ -2,11 +2,15 @@ package org.rcisoft.business.memGoldCoinFlow.entity;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.*;
 
 import org.rcisoft.core.entity.CyIdIncreEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigInteger;
+import java.util.Date;
 
 /**
 * Created with cy on 2025年2月7日 上午10:11:22.
@@ -29,7 +33,7 @@ public class MemGoldCoinFlow  extends CyIdIncreEntity<MemGoldCoinFlow> {
      * @column action_type
      * @default
      */
-     @Excel(name = "10：用户充值  11：系统充值  20：点赞   21：发动态    22：留言", orderNum = "1", width = 20)
+     @Excel(name = "10：用户充值  11：系统充值  12:系统赠送  20：点赞   21：发动态    22：留言", orderNum = "1", width = 20)
      private String actionType;
 
      /**
@@ -79,14 +83,12 @@ public class MemGoldCoinFlow  extends CyIdIncreEntity<MemGoldCoinFlow> {
      /**
       * 开始时间
       */
-     @JsonIgnore
      @TableField(exist = false)
      private String beginTime;
 
      /**
       * 结束时间
       */
-     @JsonIgnore
      @TableField(exist = false)
      private String endTime;
 }

src/main/java/org/rcisoft/business/memGoldCoinFlow/service/impl/MemGoldCoinFlowServiceImpl.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.memGoldCoinFlow.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
 import org.rcisoft.business.memGoldCoinFlow.dao.MemGoldCoinFlowRepository;
 import org.rcisoft.business.memGoldCoinFlow.entity.MemGoldCoinFlow;
 import org.rcisoft.business.memGoldCoinFlow.service.MemGoldCoinFlowService;
@@ -16,6 +17,11 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.rcisoft.core.model.CyPageInfo;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 
@@ -112,6 +118,11 @@ public class MemGoldCoinFlowServiceImpl extends ServiceImpl<MemGoldCoinFlowRepos
         MemGoldCoinFlow memGoldCoinFlow,String type){
         if (type.equals("app")){
             //小程序
+            if (StringUtils.isNotEmpty(memGoldCoinFlow.getBeginTime()) && StringUtils.isNotEmpty(memGoldCoinFlow.getEndTime())){
+                memGoldCoinFlow.setBeginTime(memGoldCoinFlow.getBeginTime()+" 00:00:00");
+                memGoldCoinFlow.setEndTime(memGoldCoinFlow.getEndTime()+" 23:59:59");
+            }
+            memGoldCoinFlow.setCreateBy(CyUserUtil.getAuthenBusinessId());
           return baseMapper.appQueryMemGoldCoinFlowsPaged(paginationUtility,memGoldCoinFlow);
         } else {
             //管理端

src/main/java/org/rcisoft/business/opmArticle/service/impl/OpmArticleServiceImpl.java

@@ -72,14 +72,14 @@ public class OpmArticleServiceImpl extends ServiceImpl<OpmArticleRepository, Opm
             flag = result.getIsPass();
             List<String> msg = new ArrayList<>();
             if (!flag)
-                msg.add(result.getErrorMsg());
+                msg.addAll(result.getErrorMsg());
             if (StringUtils.isNotBlank(opmArticle.getPictureId())){
                 JSONArray ids = JSONUtil.parseObj(opmArticle.getPictureId()).getJSONArray("id");
                 for (Object id : ids) {
                     String url = cyFileStorageService.getOssUrl((Integer)id);
                     CensorResult imgResult = contentCensorService.getImageCensorResult(url);
                     if (!imgResult.getIsPass())
-                        msg.add(result.getErrorMsg());
+                        msg.addAll(imgResult.getErrorMsg());
                     flag = flag && imgResult.getIsPass();
                 }
             }
@@ -87,7 +87,7 @@ public class OpmArticleServiceImpl extends ServiceImpl<OpmArticleRepository, Opm
                 opmArticle.setExamStatus("1");
             else {
                 opmArticle.setExamStatus("3");
-                opmArticle.setRemarks(String.join("，", msg));
+                opmArticle.setRemarks(msg.toString());
             }
         }
         //增加操作

src/main/resources/mapper/business/memGoldCoinFlow.mapper/MemGoldCoinFlowMapper.xml

@@ -87,11 +87,21 @@
     </select>
     <select id="appQueryMemGoldCoinFlowsPaged"
             resultType="org.rcisoft.business.memGoldCoinFlow.entity.MemGoldCoinFlow">
-        select mgcf.*,
+        select mgcf.*
         from mem_gold_coin_flow mgcf
         where 1=1
         and mgcf.del_flag = '0'
         and mgcf.flag = '1'
+        and mgcf.create_by = #{entity.createBy}
+        <if test="entity.beginTime !=null and entity.beginTime != '' ">
+            and mgcf.create_date &gt;= #{entity.beginTime}
+        </if>
+        <if test="entity.endTime !=null and entity.endTime != '' ">
+            and mgcf.create_date &lt;= #{entity.endTime}
+        </if>
+        <if test="entity.type !=null and entity.type != '' ">
+            and mgcf.type = #{entity.type}
+        </if>
         ORDER BY mgcf.business_id DESC
     </select>
     <select id="balance" resultType="java.lang.Integer">