活动排课

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

@@ -14,7 +14,7 @@ public class VipGroupSalarySettlementDto implements Serializable {
 //    private VipGroupSalarySettlementTypeDto vipOnlineSalarySettlement;
 
     @ApiModelProperty("收费VIP线下课收费标准")
-    private VipGroupSalarySettlementTypeDto vipOfflineSalarySettlement;
+    private VipGroupSalarySettlementTypeDto offlineSalarySettlement;
 
 //    @ApiModelProperty("赠送VIP线上课收费标准")
 //    private VipGroupSalarySettlementTypeDto giveVipOnlineSalarySettlement;
@@ -28,12 +28,12 @@ public class VipGroupSalarySettlementDto implements Serializable {
     @ApiModelProperty("赠送网管课收费标准")
     private VipGroupSalarySettlementTypeDto givePracticeSalarySettlement;
 
-    public VipGroupSalarySettlementTypeDto getVipOfflineSalarySettlement() {
-        return vipOfflineSalarySettlement;
+    public VipGroupSalarySettlementTypeDto getOfflineSalarySettlement() {
+        return offlineSalarySettlement;
     }
 
-    public void setVipOfflineSalarySettlement(VipGroupSalarySettlementTypeDto vipOfflineSalarySettlement) {
-        this.vipOfflineSalarySettlement = vipOfflineSalarySettlement;
+    public void setOfflineSalarySettlement(VipGroupSalarySettlementTypeDto offlineSalarySettlement) {
+        this.offlineSalarySettlement = offlineSalarySettlement;
     }
 
     public VipGroupSalarySettlementTypeDto getGiveVipOfflineSalarySettlement() {

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

@@ -16,7 +16,10 @@ import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.service.*;
 
+import com.ym.mec.util.excel.POIUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -114,6 +117,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         return studentPaymentOrderDao;
     }
 
+    private final static Logger LOGGER = LoggerFactory.getLogger(StudentPaymentOrderServiceImpl.class);
+
     @Override
     public StudentPaymentOrder findByUserAndActive(Integer userId, Integer activeRemark, String remark,String status) {
         return studentPaymentOrderDao.findByUserAndActive(userId,activeRemark,remark,status);
@@ -315,7 +320,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             }
 
             if (status.equals("succeeded") ||
-                    (status.equals("failed") && payingOrder.getCreateTime().before(DateUtil.addMinutes(new Date(), -35)))) {
+                    (status.equals("failed") || payingOrder.getCreateTime().before(DateUtil.addMinutes(new Date(), -35)))) {
                 try {
                     updateOrder(rpMap); //更新订单
                 } catch (Exception e) {
@@ -403,7 +408,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             confirm.put("confirm_amt", routeOrder.getRouteAmount());
             confirm.put("div_members", divMembers);
             try {
-                Payment.createConfirm(confirm);
+                Map<String, Object> map = Payment.createConfirm(confirm);
+                LOGGER.info("分账信息返回：",map);
             } catch (Exception e) {
                 continue;
             }

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

@@ -65,7 +65,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		}
 		VipGroupSalarySettlementDto vipGroupSalarySettlement = vipGroupActivityAddDto.getVipGroupSalarySettlement();
 		if(vipGroupSalarySettlement != null){
-			checkSettlement(vipGroupSalarySettlement.getVipOfflineSalarySettlement());
+			checkSettlement(vipGroupSalarySettlement.getOfflineSalarySettlement());
 			checkSettlement(vipGroupSalarySettlement.getGiveVipOfflineSalarySettlement());
 			checkSettlement(vipGroupSalarySettlement.getPracticeSalarySettlement());
 			checkSettlement(vipGroupSalarySettlement.getGivePracticeSalarySettlement());
@@ -126,7 +126,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		}else {
 			VipGroupSalarySettlementDto vipGroupSalarySettlement = vipGroupActivityAddDto.getVipGroupSalarySettlement();
 			if(vipGroupSalarySettlement != null){
-				checkSettlement(vipGroupSalarySettlement.getVipOfflineSalarySettlement());
+				checkSettlement(vipGroupSalarySettlement.getOfflineSalarySettlement());
 				checkSettlement(vipGroupSalarySettlement.getGiveVipOfflineSalarySettlement());
 				checkSettlement(vipGroupSalarySettlement.getPracticeSalarySettlement());
 				checkSettlement(vipGroupSalarySettlement.getGivePracticeSalarySettlement());

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

@@ -2262,7 +2262,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			if(Objects.isNull(vipGroupSalarySettlementDto)){
 				throw new BizException("课酬结算方案错误");
 			}
-			vipOfflineSalarySettlement = vipGroupSalarySettlementDto.getVipOfflineSalarySettlement();
+			vipOfflineSalarySettlement = vipGroupSalarySettlementDto.getOfflineSalarySettlement();
 			giveVipOfflineSalarySettlement = vipGroupSalarySettlementDto.getGiveVipOfflineSalarySettlement();
 
 			//是否是赠送课程
@@ -2271,7 +2271,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				if(vipGroup.getId().equals(activityUserMapper.getGiveVipGroupId())){
 					giveVipOfflineSalarySettlement = vipGroupSalarySettlementDto.getGiveVipOfflineSalarySettlement();
 				}else if(vipGroup.getId().equals(activityUserMapper.getVipGroupId())){
-					vipOfflineSalarySettlement = vipGroupSalarySettlementDto.getVipOfflineSalarySettlement();
+					vipOfflineSalarySettlement = vipGroupSalarySettlementDto.getOfflineSalarySettlement();
 				}
 			}
 
@@ -2389,7 +2389,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			if(Objects.isNull(vipGroupSalarySettlementDto)){
 				throw new BizException("课酬结算方案错误");
 			}
-			vipOfflineSalarySettlement = vipGroupSalarySettlementDto.getVipOfflineSalarySettlement();
+			vipOfflineSalarySettlement = vipGroupSalarySettlementDto.getOfflineSalarySettlement();
 			giveVipOfflineSalarySettlement = vipGroupSalarySettlementDto.getGiveVipOfflineSalarySettlement();
 		}