Merge branch 'dev-v5.2'

zhongzheng-api/src/main/java/com/zhongzheng/controller/face/FaceController.java

@@ -68,4 +68,12 @@ public class FaceController extends BaseController {
         }
 
     }
+
+    @ApiOperation("身份证一寸照比对")
+    @PostMapping("/certification/idCardCompareFace")
+    public AjaxResult<Integer> idCardCompareFace(@RequestBody FaceQueryBo bo){
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
+        return AjaxResult.success(iFaceService.idCardCompareFace(bo));
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsRefundServiceImpl.java

@@ -169,6 +169,7 @@ public class OrderGoodsRefundServiceImpl extends ServiceImpl<OrderGoodsRefundMap
             //题库商品
             UserExamRecordQueryBo userExamRecordQueryBo = new UserExamRecordQueryBo();
             userExamRecordQueryBo.setGoodsId(goods.getGoodsId());
+            userExamRecordQueryBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
             userExamRecordQueryBo.setUserId(order.getUserId());
             Long doQuestionNum = iUserExamRecordService.getUserDoQuestionNum(userExamRecordQueryBo);
             if(doQuestionNum.longValue()>=30){ //超30道题不满足退款

zhongzheng-system/src/main/java/com/zhongzheng/modules/tencentcloud/service/IFaceOcrService.java

@@ -18,4 +18,5 @@ public interface IFaceOcrService {
 
     Map<String,Object> ImageRecognition(FaceQueryBo bo);
 
+    Integer idCardCompareFace(FaceQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/tencentcloud/service/impl/FaceOcrServiceImpl.java

@@ -55,6 +55,11 @@ public class FaceOcrServiceImpl implements IFaceOcrService {
     private IUserProfileService iUserProfileService;
 
 
+    /**
+     * 学习拍照比对
+     * @param bo
+     * @return
+     */
     @Override
     public Integer CompareFace(FaceQueryBo bo){
         try{
@@ -140,6 +145,11 @@ public class FaceOcrServiceImpl implements IFaceOcrService {
         return null;
     }
 
+    /**
+     * 身份证OCR提取
+     * @param bo
+     * @return
+     */
     @Override
     public Map<String, String> VatInvoiceOCR(InvoiceQueryBo bo) {
         try{
@@ -169,6 +179,11 @@ public class FaceOcrServiceImpl implements IFaceOcrService {
         return null;
     }
 
+    /**
+     * 身份证号码人脸核身
+     * @param bo
+     * @return
+     */
     @Override
     public Map<String, Object> ImageRecognition(FaceQueryBo bo) {
         try{
@@ -190,4 +205,27 @@ public class FaceOcrServiceImpl implements IFaceOcrService {
         }
         return null;
     }
+
+    @Override
+    public Integer idCardCompareFace(FaceQueryBo bo) {
+        try{
+            if(Validator.isEmpty(bo.getOrderGoodsId())){
+                throw new CustomException("缺少参数");
+            }
+
+            String oneInchPhotos =bo.getOneInchPhotos();
+            Credential cred = new Credential(SecretId, SecretKey);
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setSignMethod(clientProfile.SIGN_TC3_256);
+            IaiClient iaiClient = new IaiClient(cred,"ap-guangzhou");
+            CompareFaceRequest faceRequest = new CompareFaceRequest();
+            faceRequest.setUrlA(ossHost+"/"+bo.getImageA()); //身份证照片OSS URL
+            faceRequest.setImageB(oneInchPhotos); //一寸近照
+            CompareFaceResponse response = iaiClient.CompareFace(faceRequest);
+            return response.getScore().intValue();
+        }catch (TencentCloudSDKException e){
+            System.out.println("错误"+e.getMessage());
+            return 0;
+        }
+    }
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserCourseAnswerMapper.xml

@@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND g.business_id = #{businessId}
             </if>
         </if>
-        order by uca.update_time desc
+        order by uca.update_time
     </select>
 
     <update id="delChildAnswer" parameterType="com.zhongzheng.modules.user.bo.UserCourseAnswerQueryBo" >

zhongzheng-system/src/main/resources/mapper/modules/user/UserExamWrongRecordMapper.xml

@@ -69,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         GROUP BY
         e.exam_id
+        ORDER BY
+        e.create_time desc
     </select>
 
     <select id="selectQuestionList" parameterType="com.zhongzheng.modules.user.bo.UserExamWrongRecordQueryBo" resultMap="UserExamWrongRecordVoResult">