update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentGoodsSellDto.java

@@ -16,6 +16,16 @@ public class StudentGoodsSellDto extends StudentPaymentOrder {
 
     private BigDecimal marketAmount = BigDecimal.ZERO;
 
+    private Integer autoAffirmReceiveTime;
+
+    public Integer getAutoAffirmReceiveTime() {
+        return autoAffirmReceiveTime;
+    }
+
+    public void setAutoAffirmReceiveTime(Integer autoAffirmReceiveTime) {
+        this.autoAffirmReceiveTime = autoAffirmReceiveTime;
+    }
+
     public Integer getAuthorUser() {
         return authorUser;
     }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentGoodsSellServiceImpl.java

@@ -47,6 +47,10 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = studentGoodsSellDao.queryStudentGoodsOrders(params);
+			Integer autoAffirmReceiveTime = Integer.parseInt(sysConfigDao.findConfigValue("auto_affirm_receive_time"));
+			dataList.forEach(e->{
+				e.setAutoAffirmReceiveTime(autoAffirmReceiveTime);
+			});
 		}
 		if (count == 0) {
 			dataList = new ArrayList<>();
@@ -58,14 +62,16 @@ public class StudentGoodsSellServiceImpl extends BaseServiceImpl<Integer, Studen
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void affirmReceive(String orderNo) {
+		String str = "MANUAL_RECEIVE";
 		//如果订单编号为空，那么自动确认
 		if(StringUtils.isEmpty(orderNo)){
 			String autoAffirmReceiveTime = sysConfigDao.findConfigValue("auto_affirm_receive_time");
 			//获取到期的订单编号
 			orderNo = studentGoodsSellDao.queryNoAffirmOrderNo(autoAffirmReceiveTime);
+			str = "AUTO_RECEIVE";
 		}
 		if(StringUtils.isNotEmpty(orderNo)){
-			studentGoodsSellDao.autoAffirmReceive(orderNo,"AUTO_RECEIVE");
+			studentGoodsSellDao.autoAffirmReceive(orderNo,str);
 		}
 	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -579,9 +579,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 
 	@Override
 	public void pushTeacherExceptionAttendanceTask() {
-		//获取前一天的日期
 		Date date = new Date();
-//		String format = DateUtil.format(DateUtil.addDays(date,-1), DateUtil.DEFAULT_PATTERN);
 		String format = DateUtil.format(date, DateUtil.DEFAULT_PATTERN);
 		Set<Integer> teacherId = teacherAttendanceDao.queryTeacherExceptionAttendance(format);
 		if(teacherId == null || teacherId.size() == 0){

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -89,7 +89,7 @@
          per_amount_,
          balance_payment_amount_, remit_fee_, course_remit_fee_, trans_no_,
          status_, memo_, create_time_, update_time_, payment_channel_, payment_business_channel_,
-         payment_account_no_, mer_nos_, order_no_, music_group_id_, class_group_id_, pay_time_,receive_status_)
+         payment_account_no_, mer_nos_, order_no_, music_group_id_, class_group_id_, pay_time_)
         VALUES (#{id}, #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{userId}, #{organId}, #{routingOrganId},
                 #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -98,7 +98,7 @@
                 #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{memo}, now(), now(),
                 #{paymentChannel}, #{paymentBusinessChannel}, #{paymentAccountNo}, #{merNos}, #{orderNo},
                 #{musicGroupId},
-                #{classGroupId}, #{payTime},#{receiveStatus})
+                #{classGroupId}, #{payTime})
     </insert>
 
     <!-- 根据主键查询一条记录 -->