|
@@ -9,6 +9,7 @@ import com.etotem.cfc.entity.AssessmentOrder;
|
|
|
import com.etotem.cfc.entity.AssessmentAppointment;
|
|
import com.etotem.cfc.entity.AssessmentAppointment;
|
|
|
import com.etotem.cfc.mapper.AssessmentOrderMapper;
|
|
import com.etotem.cfc.mapper.AssessmentOrderMapper;
|
|
|
import com.etotem.cfc.mapper.AssessmentAppointmentMapper;
|
|
import com.etotem.cfc.mapper.AssessmentAppointmentMapper;
|
|
|
|
|
+import com.etotem.cfc.mapper.UserMapper;
|
|
|
import com.etotem.cfc.service.CommissionService;
|
|
import com.etotem.cfc.service.CommissionService;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
@@ -33,6 +34,12 @@ public class AssessmentOrderService extends ServiceImpl<AssessmentOrderMapper, A
|
|
|
@Resource
|
|
@Resource
|
|
|
private CommissionService commissionService;
|
|
private CommissionService commissionService;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private CfCommissionService cfCommissionService;
|
|
|
|
|
+
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private UserMapper userMapper;
|
|
|
|
|
+
|
|
|
public AssessmentOrder createOrder(Long familyId, Long userId, Long memberId,
|
|
public AssessmentOrder createOrder(Long familyId, Long userId, Long memberId,
|
|
|
Long guideId, Long packageId,
|
|
Long guideId, Long packageId,
|
|
|
String guideName, String packageName,
|
|
String guideName, String packageName,
|
|
@@ -73,8 +80,9 @@ public class AssessmentOrderService extends ServiceImpl<AssessmentOrderMapper, A
|
|
|
order.setUpdatedAt(new Date());
|
|
order.setUpdatedAt(new Date());
|
|
|
boolean updated = this.updateById(order);
|
|
boolean updated = this.updateById(order);
|
|
|
if (updated) {
|
|
if (updated) {
|
|
|
- commissionService.settle(order.getId(), "assessment", order.getUserId(),
|
|
|
|
|
- order.getActualPrice() != null ? order.getActualPrice().intValue() : null, null);
|
|
|
|
|
|
|
+ cfCommissionService.settle(order.getId(), "assessment", order.getUserId(),
|
|
|
|
|
+ userMapper.selectById(order.getUserId()).getFamilyId(),
|
|
|
|
|
+ order.getActualPrice() != null ? order.getActualPrice().intValue() : 0, null);
|
|
|
}
|
|
}
|
|
|
return updated;
|
|
return updated;
|
|
|
}
|
|
}
|