Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/AppIsinMapper.xml

@@ -20,7 +20,7 @@
                 LEFT JOIN nm_order o ON i.order_id = o.id
                 LEFT JOIN nm_order_pro_info opi ON i.order_pro_info_id = opi.id
         <where>
-            i.isin_status = 1
+            i.isin_status = 1 and o.order_type != 0
             <if test="orgCode != null and orgCode != ''">
                and i.org_code = #{orgCode}
             </if>

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppCoursesVerificationRecordServiceImpl.java

@@ -9,6 +9,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.system.app.entity.AppCoursesVerificationRecord;
 import org.jeecg.modules.system.app.entity.AppOrder;
 import org.jeecg.modules.system.app.entity.AppOrderProInfo;
@@ -65,6 +66,7 @@ public class AppCoursesVerificationRecordServiceImpl extends ServiceImpl<AppCour
                 verificationRecord.setVerifyStatus(CommonConstant.STATUS_1_INT);
                 verificationRecord.setVerifyUserId(sysUser.getId());
                 verificationRecord.setVerifyUserName(sysUser.getRealname());
+                verificationRecord.setVerifyTime(DateUtils.getDate());
                 verificationRecord.setVerifyImage(coursesVerificationRecordForm.getVerifyImage());
                 baseMapper.updateById(verificationRecord);
                 //修改订单状态

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/service/impl/AppOrderServiceImpl.java

@@ -9,6 +9,7 @@ import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.app.vo.AppGameScheduleVO;
 import org.jeecg.modules.app.vo.AppOrderProInfoVerifyVO;
 import org.jeecg.modules.app.vo.ScanCodeQueryOrderVO;
@@ -299,10 +300,10 @@ public class AppOrderServiceImpl extends ServiceImpl<AppOrderMapper, AppOrder> i
         for (String isinId : isinIds) {
             //查询对应券号
             AppIsin appIsin = appIsinMapper.selectById(isinId);
-            appIsin.setIsinStatus(CommonConstant.ISIN_STATUS_2);
+            appIsin.setIsinStatus(CommonConstant.ISIN_STATUS_1);
             appIsin.setVerifyUserId(loginUser.getId());
             appIsin.setVerifyUserName(loginUser.getUsername());
-            appIsin.setUseTime(new Date());
+            appIsin.setUseTime(DateUtils.getDate());
             appIsinMapper.updateById(appIsin);
             //修改订单状态
             String orderProInfoId = appIsin.getOrderProInfoId();