fix

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -150,7 +150,7 @@ handouts:
 
 Nuonuo:
     host: https://sdk.nuonuo.com/open/v1/services
-    APPkey: SD39149760
+    APPkey: 39149760
     APPSecret: 07168A248B2844E0
 
 oldOrder:

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/domain/TopNuoMplatformLog.java

@@ -62,4 +62,5 @@ private static final long serialVersionUID=1L;
     /** 推送结果 */
     private String pushResult;
     private Integer pushStatus;
+    private String xmlUrl;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/service/impl/TopNuoMplatformLogServiceImpl.java

@@ -194,6 +194,7 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
             snList.add(vo.getInvoiceSerialNum());
             if(snList.size()==10||i==(list.size()-1)){
                 String result = nuonuoService.queryInvoiceResult(snList);
+                System.out.println(result);
                 JSONObject jsonObject = (JSONObject) JSONObject.parse(result);
                 String code = String.valueOf(jsonObject.get("code"));
                 JSONArray josnList = jsonObject.getJSONArray("result");
@@ -206,12 +207,14 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                         String status = String.valueOf(itemObject.get("status"));
                         String pdfUrl = String.valueOf(itemObject.get("pdfUrl"));
                         String failCause = String.valueOf(itemObject.get("failCause"));
+                        String xmlUrl = String.valueOf(itemObject.get("xmlUrl"));
                         String oldStatus = "1";
                         objectLambdaUpdateWrapper.eq(TopNuoMplatformLog::getInvoiceSerialNum, serialNo);
                         //开单完成状态
                         if("2".equals(status)){
                             oldStatus = "1";
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPdfUrl, pdfUrl);
+                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getXmlUrl, xmlUrl);
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getStatus, 2);
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getUpdateTime,DateUtils.getNowTime());
                         }else{

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/vo/TopNuoMplatformLogVo.java

@@ -64,4 +64,5 @@ public class TopNuoMplatformLogVo {
 	@Excel(name = "失败原因")
 	@ApiModelProperty("失败原因")
 	private String failCause;
+	private String xmlUrl;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -457,7 +457,11 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
             if(Validator.isEmpty(lastVo)||Validator.isNotEmpty(bo.getPhoto())||Validator.isEmpty(lastVo.getVideoCurrentTime())||lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue()){
                 //如果没有历史数据或者之前播放时长比现在晚，或者携带照片则新增观看记录
                 if(Validator.isNotEmpty(lastVo)&&Validator.isNotEmpty(lastVo.getSectionId())&&Validator.isNotEmpty(bo.getErJianErZao())&&bo.getErJianErZao()&&Validator.isEmpty(bo.getPhoto())&&(lastVo.getVideoCurrentTime().longValue()>add.getVideoCurrentTime().longValue())){
-                    return 0;
+                    if(Validator.isNotEmpty(add.getStatus())&&add.getStatus()==1){
+                        this.save(add);
+                    }else{
+                        return 0;
+                    }
                 }else{
                     this.save(add);
                 }